change style for buttons and add disabled style
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/templates/index.html.ftl