Merge branch 'master' into issue131_optimized
Merge branch 'pr/137' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Fix 'hide property label'
Merge branch 'master' into develop
Fix for #160
Merge pull request #161 from imulus/feature/fix-customviews

Fix for #160
Merge branch 'master' into fix/unique-aliases

Conflicts:
	app/views/archetype.default.html