Merge pull request #28 from marketboomer/ratjens

it's ok to have a default application layout file here
Merge branch 'current' of https://github.com/marketboomer/nunchaku into stable
add some helper methods to assist in setting up nests when super resources just can't cut it

for example, when a polymorphic nesting crosses engine boundaries
add some helper methods to assist in setting up nests when super resources just can't cut it

for example, when a polymorphic nesting crosses engine boundaries
Merge branch 'ratjens' of github.com:marketboomer/nunchaku into ratjens

Conflicts:
	app/controllers/concerns/nunchaku/resources.rb
Merge pull request #30 from marketboomer/ratjens

add some helper methods to assist in setting up nests when super resources just can't cut it
Merge pull request #32 from marketboomer/richard

Get rid of parent attributes for sorting
Merge branch 'master' of https://github.com/marketboomer/nunchaku into current
add bootstrap x-editable for edit-in-place
Merge branch 'refs/heads/master' into ratjens
Merge branch 'refs/heads/current' into ratjens
Merge pull request #33 from marketboomer/ratjens

add bootstrap x-editable for edit-in-place
stop tabs and summary location algorithm from spraying an ancestor list on the page when the can't find a partial
Merge pull request #34 from marketboomer/ratjens

stop tabs and summary location algorithm from spraying an ancestor list on the page when the can't find a partial
Support for stop words.