Added Current Time activity for DB testing
Merge branch 'master' of https://github.com/Tranquility2/TimeOn

Conflicts:
	TimeOn/src/main/AndroidManifest.xml