11/23/2014 cesar
Merge origin/master

Conflicts:
	css/header.css
	settingsMenu.php