modified the admin/content controller file.
Merge branch 'master' of github.com:techvision/brails4
modified the controllers and spec file.
Merge branch 'master' of github.com:techvision/brails4
resolve the conflict from seed file.
resolve the conflict and modified the topic model file.