Signed-off-by: Dimitar Bankatev <dbankatev@gmail.com>
Merge branch 'master' of https://github.com/dbankatev/mitkotest

Conflicts:
	views/pages/blocks/header/header.jade