tes json
Merge branch 'master' of https://github.com/plansys/Plansys

Conflicts:
	.gitignore