rewriting the html pages using directive...
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	UserInterface/Shared/scripts/models.js