Fixed bug that caused an error: "array_merge(): Argument #2 is not an array" when there is no parameter with keys "criteria" and "sorting"
Added specs examples for overriding criteria and sorting parameters in route.
Some method has been renamed to be consistent
Merge pull request #1771 from aRn0D/fix/methodname

Some method has been renamed to be consistent
Adding a resource form type
Merge remote-tracking branch 'upstream/master'