don't relinquish device admin when restarting service
remove files that shouldn't have been committed
finally releasing version 0.4.0
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	bin/HallMonitor.apk
	gen/org/durka/hallmonitor/BuildConfig.java