Fix disabling pushing for resizing too
Update minified version
Merge branch 'fix-135' of https://github.com/simplesmiler/angular-gridster into simplesmiler-fix-135
Merge branch 'simplesmiler-fix-135'

Conflicts:
	dist/angular-gridster.min.js
basic support for "swapping" items of the same size
document "swapping" option
resolve focus of input
reabased to add swapping
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/angular-gridster.js