commit from Habib
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/.name
	.idea/gradle.xml
	.idea/modules.xml
	ProTrack-Android34.iml
	app/app.iml
commit from Habib
Merge remote-tracking branch 'origin/master'