Editing Tasks Page
Merge remote-tracking branch 'origin/master'
Create dash and tasks route providers and controllers
Merge remote-tracking branch 'origin/master'

Conflicts:
	addTask.html
	js/app2.js
Merge remote-tracking branch 'origin/master'
Create dash and tasks route providers and controllers