Merge branch 'dev' of https://github.com/mp-se/gravitymon into dev

Merge branch 'dev' of https://github.com/mp-se/gravitymon into dev #245