changes for new header design
Merge remote-tracking branch 'origin/master'

Conflicts:
	philaalertswidget.php