DB:  Adding lastActivity date to the user.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	assets/app/bunker.js
	assets/app/room/MessageLogController.js
	views/index.ejs
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	assets/app/bunker.js
	assets/app/room/MessageLogController.js
	views/index.ejs
DB:  Adding lastActivity date to the user.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	assets/app/bunker.js
	assets/app/room/MessageLogController.js
	views/index.ejs
Merge remote-tracking branch 'upstream/master'
Updating the away code.
Adding lastActivity on connect.  Updating the away timeout to 5 minutes. Minor cleanup
DB:  Fixing statuses via receiving a message.   Updating the css on the emoticons.  Restoring Drew's resolve on the rooms controller.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	assets/app/emoticons.js
	assets/app/header/HeaderController.js
	assets/app/header/header.html
	assets/app/room/InputController.js
	assets/app/room/room.html
	assets/styles/bunker.css
More merged files missed in init commit
performance tweaks
fixed header back to normal
removed comment
Merge branch 'djbielejeski-master'