Merge branch 'master' of https://github.com/chkkassd/CRMManager

Conflicts:
CRMManager/Base.lproj/Main_iPhone.storyboard