no message
Merge branch 'master' of https://github.com/bDino/VS2013-2014

Conflicts:
	VSP_A3_Middleware/src/mware_lib/ServerListener.java