Task 1 - design the edit task page
Merge branch 'master' of https://github.com/asnir/OnMyWay

Conflicts:
	app/js/controllers.js
	app/js/services/data/indexedDbService.js
	docs/To do list.docx