.
Merge branch 'master' of
https://github.com/c0mpas/MobileAppDevelopment.git

Conflicts:
	TaskList/src/com/example/tasklist/CategoryActivity.java