more layers
changing li styles
relabeling IFRC to ICRC area of opps
adding IFRC ops areas
more layers
merging Robert changes
icrc layers
fixing legends
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/main.js