bugs with page refresh are in work
Merge branch 'master' of https://github.com/KernelCorp/almadeladanza

Conflicts:
	app/assets/javascripts/lib/container_height.js.coffee
	app/assets/javascripts/lib/jscrollpane_iniialize.js.coffee