uyyu
Merge branch 'master' of https://github.com/cruchaue/Miage_Share.git

Conflicts:
	MIAGE_SHARE/.classpath
	MIAGE_SHARE/src/ipConfig.properties