Updates
Merge branch 'master' of https://github.com/blackravendb/therminox

Conflicts:
	application/layouts/scripts/layout.phtml