Temporarily disabled UIIntegration tests until Xcode 6 issues resolved
Merge branch 'SZ-94' into development

Conflicts:
	Makefile