back-end cleanup
Merge branch 'master' of https://github.com/alexbodea/globalnews

Conflicts:
	public_html/controllers/index.php
	public_html/index.php