Merge branch 'develop'
Merge branch 'master' of github.com:ulmic/nastachku
Merge branch 'hotfix/fix_time'

* hotfix/fix_time:
  remove time zone
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  minor fixes
  minor shop add
  add facebook signin view
fix make up
Merge branch 'hotfix/fix_haml' into develop

* hotfix/fix_haml:
  fix make up