resolve merge conflict
Merge branch 'update_twitter_share_verbage' into staging
reapplied Twitter Text
merged
removed empty migraton
added columns to subscription and people for new time settings
Merge branch '36-more_active' into staging
Merge branch 'staging' of https://github.com/CivicCommons/CivicCommons into staging
add rake task to clear cache, call it from before_symlink
add foreman gem
User settings tabs
add mentions to TinyMCE
Added mention plugin
Enabled noneditable plugin
fix to embedly service link when no image exists
add method to Contribution model to extract mentions from html
Merge branch '30-ckeditor_mentions' into staging
Fixed comment
added columns to subscription, options to person settings
moved button
asset cleanup
Merge branch 'css_compilation_cleanup' into staging
move the uglifier gem
Revert "add mentions to TinyMCE"

This reverts commit 7b5d310b5891e31eccdb212586440bd4039071f9.