Color and size vars defined, defaults for admin defined, minor style changes, meeting rooms are able now to be created via ajax
Pull request
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios

Conflicts:
	Gemfile.lock
	app/views/admin/contact_contents/index.html.haml
	app/views/admin/meeting_rooms/index.html.haml
	app/views/admin/overviews/show.html.haml
	app/views/admin/people/index.html.haml
	app/views/admin/rooms/index.html.haml
	app/views/conversations/index.html.haml
	app/views/shared/_recap.html.haml
push