First commit
Merge branch 'master' of https://github.com/luca91/EMS

Conflicts:
	.gitignore