no log
Bootstrap3 and auth
Merge remote-tracking branch 'origin/master'