Syntax fix
Merge branch 'master' of https://github.com/cmpt371Group1/Patient-Life-Simulator

Conflicts:
	phonegap/www/js/models.js