Set Category
Merge branch 'master' of https://github.com/ShervinS/dontpanic
Fixed
Conflicts:
	tasks/TasksPanelController.java