Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  minor fixes
  minor shop add
  add facebook signin view
Merge branch 'hotfix/fix_time' into develop

* hotfix/fix_time:
  remove time zone
Merge branch 'hotfix/fix_haml' into develop

* hotfix/fix_haml:
  fix make up
fix make_up
fix tabs border
fix nophoto photo in account
add facebook link in account
Merge remote-tracking branch 'origin/develop' into develop
fix
Merge branch 'develop'