Lock boostrap-sass to 2.3.0.1 until this issue is fixed - https://github.com/twitter/bootstrap/issues/7118
Fixes squish-task #17738
Fixed the issue with Slickgrid columns not resizing.
Updated jquery.event.drag to v2.2 from v2.0 (It didn't seem to play nice with recent jQuery releases).
Fixes https://squish.ish.com.au/tasks/view/17728
Fix deployment in production environment
Conflicts:
	config/environments/production.rb
Fix indentations and whitespace
Move the load of config/application.yml into config/application.rb
Do a little housekeep in config files