Reverting back to working copy
Merge branch 'JoseDev' of https://github.com/mpu42/UberTutor into JoseDev

Conflicts:
	UberTutorAndroid/app/build.gradle
	UberTutorAndroid/app/src/main/res/menu/offer_course.xml
	UberTutorAndroid/settings.gradle