Changes made by Tsvetan Manev (tsvetanmanev@gmail.com).
Merge branch 'master' of https://github.com/RadvachTsvetkov/AppBuilder.git

Conflicts:
	Tasks on Steroids/views/tasks.html
Changes made by Tsvetan Manev (tsvetanmanev@gmail.com).