me

have to commit to get new version
Merge branch 'master' of https://github.com/Borisbalde/MobileIndustryCast

Conflicts:
	MobileIndustryCast/MobileIndustryCast/src/com/mobileindustrycast/ChatRoom.java
	MobileIndustryCast/MobileIndustryCast/src/com/mobileindustrycast/XMPP_setting.java

HELLOOOOO