Windows fix &
Merge branch 'master' of https://github.com/esemi/otava-yo

Conflicts:
	app/layouts/frontend.phtml