Can now get one message
Merge branch 'master' into FH-18_HenteEnMelding

Conflicts:
	www/js/controllers/messageCtrl.js
Merge pull request #8 from jarlefosen/FH-18_HenteEnMelding

Can now get one message