forgot no changes made whoops
Merge branch 'master' of https://github.com/mgosciniak/evolveapet

Conflicts:
	evolveapet/eap_frontend/save.sav
make sure active animal is reset if user releases active animal
Merge branch 'master' of https://github.com/mgosciniak/evolveapet

Conflicts:
	evolveapet/eap_frontend/save.sav