stash
Merge pull request #8 from stevemcquaid/sean

embedded content attributes in all subtypes
some changes
Merge branch 'master' of github.com:stevemcquaid/cmunity
layout + controller changes for group
Merge branch 'remotem' into dev
Merge branch 'dev'
fixed layout
updates
Merge pull request #9 from stevemcquaid/steve

Steve
Merge pull request #10 from stevemcquaid/sean

updated to remove content.user errors
Updated rails codebase from 3.2.1 to 3.2.13. Updated twitter bootstrap gem to comply with latest version of rails