Update
Merge branch '7.x-2.x' of https://github.com/humanitarianresponse/theme into 7.x-2.x

Conflicts:
	.sass-cache/4fe4890c1ca6b8d15052d7bef9f1dbd3fdb5768f/_menu.scssc