maj
Merge branch 'master' of https://github.com/abelass/websimple

Conflicts:
	.gitignore