Merge branch 'master' of https://github.com/nai0om/some_project

Conflicts:
LocationTrial/LocationTrial/en.lproj/MainStoryboard.storyboard