merge
Merge origin/master

Conflicts:
	www/js/controllers.js
Merge origin/master

Conflicts:
	www/js/controllers.js
Merge origin/master
- datepicker tryout
Merge origin/master

Conflicts:
	www/js/services.js