merge master
added error message.
Merge branch 'feature/workError' into develop
changed default stuff in voicecasting view.
Merge branch 'master' of https://github.com/RossMerriam/Wave-v2