Merge branch 'custom-rest-methods'

Conflicts:
	lib/her/model.rb
	lib/her/model/orm.rb