fixing the task scheduler
fixing the task scheduler
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/emd/emdmobile/app/MainActivity.java
fixing the task scheduler