Api af?
Merge branch 'master' of github.com:JelteF/bottor

Conflicts:
	tracker/app/controllers/__init__.py
	tracker/app/models/task.py