Fixed formatting selection type properties
Merge branch 'master' of git@github.com:Dexels/navajo.git

Conflicts:
	core/com.dexels.navajo.document/src/com/dexels/navajo/document/json/impl/JSONTMLImpl.java
Refactored merging templates to EntityHelper