add layout
	modified:   src/control/home.py
	modified:   template/home.tpl
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/control/home.py
	template/home.tpl