Merge branch 'develop' of https://github.com/lergo/lergo-ui into develop

Conflicts:
	app/index.html