Minor xcode syntax changes
Minor update to controller code
Merge branch 'WebRedux' of https://github.com/Foundry376/46px into WebRedux

Conflicts:
	.gitignore
Merge branch 'WebRedux' of https://github.com/Foundry376/46px into develop

Conflicts:
	.gitignore