Changes
Merge branch 'master' of https://github.com/jsilvamo/DailyRegs

Conflicts:
	js/services/DataService.js
	views/main.html