back-end
Merge remote-tracking branch 'origin/master'

Conflicts:
	public_html/controllers/index.php
Merge branch 'master' of https://github.com/alexbodea/globalnews