Add inherited resource templates.
get cms generator working on elesaganter_web
fix specs, add nav link only with kuhsaft
Merge branch 'features/inherited_resources'

Conflicts:
	features/shoestrap/generators/cms_generator_spec.rb
	lib/generators/shoestrap/cms_generator.rb
prep for release