front end bugs
Merge pull request #25 from juanchel/jcb

front end bugs
stop the block
Merge branch 'master' into chish

Conflicts:
	UI/app/controllers/message.js