Merge pull request #63 from acmetech/master

A few updates decribed by the commit messages
Merge pull request #65 from acmetech/master

Fix a few issues and start getting combustion ready
Merge pull request #66 from acmetech/master

Code refactoring
Merge pull request #67 from acmetech/master

Fix audience not saving issue
Merge pull request #68 from acmetech/master

Get testing working with the dummy app. Will come back to combustion later.
Merge pull request #72 from acmetech/master

Remove activity_id from comments
Merge pull request #73 from acmetech/master

Some activity related refactorings
Merge pull request #74 from acmetech/master

Fix i18n namespacing issue
Merge pull request #75 from acmetech/master

Move the Activity content column to a new ActivityField model