updated to use DSL context save/restore
remove json file
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	permissions-model.rb