[#42] fix sorting
fix no-collection case
Cleanup and fix some duplicate methods
fix sorting once again
fix filtering for sorting
fix conflict with simple_form
revert rename
revert rename
Merge remote-tracking branch 'bartoszkopinski/master'