sadsd
Fixed conflicts

Merge branch 'master' of https://github.com/E-HealthTeam/ehealthPG_Android

Conflicts:
	js/util/TimeEngine.js