merge
fix
Merge branch 'master' of github.com:mattiskan/ICA

Conflicts:
	apps/ICA_app/common/index.html