schedule base activity
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
Schedule time picker added
Merge remote-tracking branch 'origin/master'