Sync
Merge branch 'master' of https://github.com/anivader1789/Wildfire

Conflicts:
	Wildfire/AppDelegate.m
	Wildfire/LoginScreenViewController.m
	Wildfire/iPhoneMain.storyboard