fixing gridster folder
Merge branch 'master' of https://github.com/outsidehack/MyStory

Conflicts:
	views/assets/css/jquery.gridster.css
	views/assets/js/jquery.collision.js
	views/assets/js/jquery.coords.js
	views/assets/js/jquery.draggable.js
	views/assets/js/jquery.gridster.extras.js
	views/assets/js/jquery.gridster.js
	views/assets/js/utils.js