CLSN-1142 combine file detail/column/mapping
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	UserInterface/Content/Site.css