Add ability for extension/form generators to append to existing seeds.rb file instead of overwriting it. #1532.
Refinery::AuthSys module can be injected directly into ::ApplicationController.
Avoid double module inclusion.
Add help to refinerycms command. #1538, #1539.
travis should test against jruby in 1.8 and 1.9 modes
JRuby 1.9 mode is allowed to fail (currently)
Stop route reloading madness. #1599.
Merge pull request #1649 from resolve/issue_1599

Stop route reloading madness. #1599.
Only run one test task on Travis without the JS switch.
Merge remote-tracking branch 'thedarkone/no-double-inclusion'
Renamed include_unless_included to include_once
Manually preload the :translations to avoid the N+1 queries.
Combined patches and linked to a PR in awesome_nested_set where passing a relation *will* work.
Implement feedback from @ugisozols.
fixed engine generation view that had hardcoded "title" attribute
Use || not or
Fixes #1568 by removing errant documentation.
Allows the help command to access the CMS generator when running as a gem or running in development mode and included option aliases.
Merge pull request #1655 from resolve/issue_1538_1539

Implements refinerycms --help
Extract list_reorder from admin.js in sortable_list.js
Modify sortable list to make it able to have many sortable lists on one page

Conflicts:

	core/app/views/refinery/admin/_make_sortable.html.erb