renamed some nomenclatures
Merge branch 'master' of https://github.com/gibatronic/inout

Conflicts:
	client/styles/layout/_lander.scss