small preparings
Merge branch 'master' of https://github.com/psychs/limechat

Conflicts:
	LimeChat.xcodeproj/project.pbxproj