fhgfh
Merge branch 'master' of
https://github.com/GravityInnovations/tasks.done.android.git

Conflicts:
	trunk/tasks.done/AndroidManifest.xml
Merge branch 'master' of
https://github.com/GravityInnovations/tasks.done.android.git