Server git setup
Merge branch 'master' of https://github.com/mazenhamza/healthcare

Conflicts:
	.gitignore
	light-editor.html