jh
by eng.medhat
Merge remote-tracking branch 'origin/master'

Conflicts:
	DrawActivityDemo/src/com/example/drawactivitydemo/SwaperService.java