MAGEMEP-157 Not complete. Disable edition of the template directly; add new fields in the attribute popup
MAGEMEP-157 (not complete) Add a new column in the attribute list
[MAGEMEP-157] (not complete) Add a new button for generating the template
Merge branch 'MAGEMEP-157' into development

Conflicts:
	src/app/code/community/Flagbit/MEP/sql/mep_setup/mysql4-upgrade-0.9.1-0.9.2.php