ctrl+f5 should work
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	UserInterface/Shared/templates/menu.html