cleaned up some stuff- fixed sizing of options
merged
Merge branch 'develop' of https://github.com/ARISGames/iOSClient into develop

Conflicts:
	src/ARISAppDelegate.m
revamp loginscreen
image shuffling
loginviewcontroller sizes correctly on all devices/os's