Merge remote-tracking branch 'origin/template'

Conflicts:
	application/modules/shop
Merge remote-tracking branch 'origin/master'