Edit inline can now be turned off
Removed readonly check when adding :del to the context menu to match existing functionality
Lock rspec to the newest version
Merge remote-tracking branch 'upstream/master'
Merge pull request #95 from scho/master

Lock rspec to the newest version
Rewrite grid_with_action_column.feature with mocha specs
Add `enable_edit_inline` option for Grid

Thanks @pward123!

Conflicts:
	lib/netzke/basepack/grid/javascripts/grid.js
	lib/netzke/basepack/grid_panel.rb
Merge remote-tracking branch 'upstream/master'
Fixed `Netzke::Basepack::DataAdapters::ActiveRecordAdapter#get_records` to handle multiple sorting criteria e.g. if using the grouping feature