Adding edit link on content/index
Merged pull request from svizion
Bug fix on content controller
Merge branch 'master' of github.com:jfox015/Bonfire-News

Conflicts:
	models/news_model.php
Committing work from svizion
Bug Fixes
Bonfire 0.6 updates
Adding updates from svizion
Merge branch 'development'
Merge branch 'master' of github.com:jfox015/Bonfire-News
Merge branch 'development'
Merge of development into master