initial commit
Merge https://github.com/pst-git/clusil-intranet

Conflicts:
	.gitignore