Initial commit
Merge branch 'master' of github.com:Unicon/unicon-simplesamlphp

Conflicts:
	.gitignore