Production-only changes.
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge remote-tracking branch 'origin/master' into production
Merge remote-tracking branch 'origin/master' into production
Merge remote-tracking branch 'origin/master' into production
Merge remote-tracking branch 'origin/master' into production
Merge remote-tracking branch 'origin/master' into production
Merge remote-tracking branch 'origin/master' into production

Conflicts:
	views/bbooapp.ejs
Merge remote-tracking branch 'origin/master' into production
Merge remote-tracking branch 'origin/master' into production

Conflicts:
	public/login/login.html
Updated .gitignore.
Merge branch 'master' into production
Merge branch 'production' of github.com:babelboo/babelboo-app
Revert "Merge branch 'production' of github.com:babelboo/babelboo-app"

This reverts commit fa118e8842def02911f2a90442ee14a23704d6bb, reversing
changes made to 278f39318b0df465d1657ad1a79bc2af30c3e836.