Scary green footer
Merge remote branch 'origin/develop' into wojtek

Conflicts:
	index-new.html
	styles/less/page.less