Log In Functionality Added
Merge branch 'Develop' into Merge-In-Icons

Conflicts:
	iPhoneClient/InnovSettingsView.m
	iPhoneClient/InnovViewController.m
Fixed Tags and edited to display on 4-inch devices
Commit
Merge branch 'master' into Develop

Conflicts:
	iPhoneClient/InnovSettingsView.m
	iPhoneClient/InnovViewController.m