Move key and presentable name initialization to constructor
Reimplement else template
Merge remote-tracking branch 'origin/livetemplate' into livetemplate

Conflicts:
	src/org/jetbrains/postfixCompletion/templates/PostfixTemplate.java