shorcuts collection
Merge branch 'modules'
home path changer
Merge branch 'modules' into dev
Merge branch 'dev' into look-and-feel

Conflicts:
	client/main/index.js