More movement and battle tests 

Need testing with mobile app for #216 and #217 .
Close #214
Merge branch 'master' of https://github.com/JaanJanno/Georivals.git