fixed some bugs
 added new message flag
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team2