Merge branch 'master' of https://github.com/bitwork/bitwork-iPad-APP

Conflicts:
	APP/www/js/ui/calendar.js
its  crazy