integration of gui part
revert some changes of integrated gui
Merge branch 'master' into network_json

Conflicts:
	source/big-buum-man-server/.classpath