add base type to the is_mere_relation notation, close #586
Merge pull request #590 from mikeshulman/mererel

add base type to the is_mere_relation notation, close #586
Conform to naming conventions a bit better
also rename in HoTTBookExercises
Merge pull request #591 from mikeshulman/biinv-naming

Conform to naming conventions a bit better
improve lift and lower
adding more universe annotations
improve lift and lower
Merge branch 'lift' into modal-universes

Conflicts:
	theories/Basics/UniverseLevel.v