Added time to textview
Merge branch 'master' into Keep-Time

Conflicts:
	src/com/jagsstudio/androidclock/MainActivity.java
updated branch
Merge branch 'Keep-Time'