Header bar update
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
res update - colorblind shotgun mod
midnight commit
midnight commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/res/layout/company_detail_layout.xml
	client/res/layout/route_item_layout.xml
midnight commit