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

Conflicts:
	lapps-vocab/.gitignore
	target/test-classes/template.html

k
Merge branch 'develop' of https://github.com/oanc/lapps-vocab into develop

Conflicts:
Merge branch 'develop' of https://github.com/oanc/lapps-vocab into develop