Merge branch 'master' of https://github.com/r0h4n/eispro

Conflicts:
	eispro/templates/tasks.html
Merge branch 'master' of https://github.com/r0h4n/eispro