local commit after merging in github
Merge branch 'master' of https://github.com/anupdhalwani1/Eclipse.git

Conflicts:
	Ospinet/bin/Ospinet.apk
	Ospinet/bin/resources.ap_