Fixed conflicts
Merge branch 'dev' of https://github.com/verath/ESCP into dev
Fixed bullets and swing rotation