Done for night
woot woot
Merge remote-tracking branch 'origin/master'

Conflicts:
	taskslist.php