Messages refactoring and starting tests
Starting on coverage
Merge branch 'develop' into test-messages
Test coverage
Merge branch 'develop' into test-messages

Conflicts:
	server/routes/messages.js
Merge pull request #255 from Wizecoder/test-messages

Messages tests and some code coverage stuff