Merge branch 'master' of https://github.com/lackhurt/yaf.DT

Conflicts:
	app/views/layout/header_common.phtml