bug fix: placeholder's extra watched elements work
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios

Conflicts:
	app/assets/javascripts/shared/box.js
	app/views/admin/meeting_rooms/index.html.haml