application v 1
main page v 1
Merge branch 'master' of https://github.com/windstruck/itnews

Conflicts:
	application/views/admin/news/addnews.php