add facebook signin view
Merge remote-tracking branch 'origin/develop' into develop
minor shop add
minor fixes
Merge branch 'develop'
Merge branch 'master' of github.com:ulmic/nastachku