no message
Merge branch 'master' of https://github.com/mowl/thesocialtimes

Conflicts:
	application/views/news.php
no message