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

Conflicts:
	js/collections/JSONSerializableCollection.js
	js/models/PersistenceManager.js
	js/views/pages/HomeView.js
	js/views/pages/NotificaEventoView.js
Minor fixes after merging branch