Merge origin/master

Conflicts:
	www/js/services.js
Merge origin/master
- datepicker test iOS
Merge origin/master