tes
.gitignore is now working
Merge branch 'master' of https://github.com/plansys/Plansys

Conflicts:
	protected/config/settings.json