Many many fixes
Merge branch 'master' of https://github.com/TeamKhameleon/KhameleonChatter

Conflicts:
	iOS-Chatter-App/iOS Chatter app/Base.lproj/Main.storyboard