bootstrap layout added
Merge branch 'add-bootstrap-to-app' into develop
user auth
Merge branch 'develop'