delete metis
Merge remote-tracking branch 'osgo/master'

Conflicts:
	views/metis/public/layout.tpl
	views/metis/public/left.tpl