retrieved templates and validation
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
fixed create entry with editable
GRRRR
deleted .idea AGAIN