Merge branch 'master' of https://github.com/idleft/first_app