localisation added
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	package.json
localisation added
small json changes