Hovers, etc
Merge remote-tracking branch 'origin/master'

Conflicts:
	Reactr/Reactr-Reactr.iml
	Reactr/Reactr.iml
Hovers, etc