Merge branch 'production'

Conflicts:
	TestAppDelegate.h
	main.m
