Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	assets/app/bunker.js
	assets/app/room/MessageLogController.js
	views/index.ejs