prueba ok
Merge branch 'master' of https://github.com/Kuorum/kuorum

Conflicts:
	web-app/css/custom.css