Merge branch 'mark/setup_api' into development
Add api feeds_controller
Change FeedEntry.descirption & FeedEntry.content to use text types
Add feed_id to FeedEntry
Migrate db
Remove obsolete attr_accessible from FeedEntry model
Add feed_group_id to FeedEntry model
Add user_id to FeedEntry
Migrate db
User now has many feeds
Fix incorrect migration: user_id should be added to Feed, not FeedEntry
Add user_id to FeedEntries
Complete User-Feed-FeedEntry association:
  - User has many Feeds
  - Feeds has many FeedEntries
  - User has many FeedEntries
Fix wrong migration: add feed_group_id to Feed
Add dashboard_id to FeedGroup
Add user_id to Dashboard
Migrate db, now feed_group_id is in Feed
Complete model association and validation
Merge branch 'mark/feed_model' into development
Merge branch 'development' into mark/setup_api