bimms
Merge branch 'master' of https://github.com/salivalevil/TasKing.git

Conflicts:
	res/values/strings.xml
	src/com/club_duskamo/taskapp/TaskListFragment.java