Some changes to directory structure

Modified package names etc
Conflicts management

Some conflicts had occurred. Hopefully I've resolved them..
Merge remote-tracking branch 'origin/master'

Conflicts:
	ImageDemo/AndroidManifest.xml
	ImageDemo/gen/com/androidmyway/healthizen/R.java
	ImageDemo/src/com/kamikaze/healthizen/SendMailScreen.java