Buttons & Slider
Merge branch 'master' of https://github.com/imp14a/inmobiliaria_zumo

Conflicts:
	app/View/Property/add.ctp
	app/webroot/js/scriptaculous/builder.js
	app/webroot/js/scriptaculous/controls.js
	app/webroot/js/scriptaculous/dragdrop.js
	app/webroot/js/scriptaculous/effects.js
	app/webroot/js/scriptaculous/scriptaculous.js
	app/webroot/js/scriptaculous/slider.js
	app/webroot/js/scriptaculous/sound.js
	app/webroot/js/scriptaculous/unittest.js