updating button color
Merge branch 'master' of github.com:RSV2/foliage
adding updated js/css for new messages page
Merge branch 'master' of github.com:RSV2/foliage

Conflicts:
	dist/app.js
	dist/app.js.map