Merging with fork
Merge branch 'master' into Memory-Leaks

Conflicts:
	QuickHubApp/AppController.h
	QuickHubApp/AppController.m