still working on style
Merge branch 'master' of https://github.com/E-HealthTeam/ehealthPG_Android

Conflicts:
	js/router.js
	js/views/StructureView.js