Merge branch 'master' of https://github.com/f-mon/startup

Conflicts:
	.idea/workspace.xml
	public/home/home.js