Adjust UI
Merge branch 'master' of https://github.com/agidot/cyloncmd

Conflicts:
	app/coffees/main.coffee
	app/scripts/main.js
Style UI