working with Parse iOS
Merge branch 'master' of github.com:blounty/SwitchAB

Conflicts:
	.DS_Store
	SwitchAB.Client.userprefs
	SwitchAB.Web/Controllers/TrialsController.cs