Update Layout Template
Merge conflict
Merge branch 'master' of https://github.com/joomlart/t3v3

Conflicts:
	templates/ja_t3v3_blank/etc/megamenu.ini