stable
Merge branch 'master' of https://github.com/simplifiedapps/simplified

Conflicts:
	.gitignore