Merge branch 'dev'
Update README.md
Update README.md
Update version number in uw.info
Bump version number
Merge branch 'dev'

Conflicts:
	uw.info
Merge branch 'release/7.x-2.0-rc1'

Conflicts:
	README.md
	uw.info
Merge branch 'release/7.x-2.0-rc2'
Update UW-MENU-README.md

Add instructions for importing menu items with drush
Merge branch 'release/7.x-2.0-rc3' into 7.x-2.x
Clear floats in .sidebar
Correct indentation in layout.scss