Up
Merge branch 'master' of https://github.com/ctekjlo/default-layout

Conflicts:
	.gitmodules
Merge branch 'master' of https://github.com/ctekjlo/default-layout