front-end Production ready !
Merge branch 'master' of https://github.com/alexbodea/globalnews

Conflicts:
	public_html/controllers/includes/header.php
	public_html/views/header.html