resolved weird conflict
Merge branch 'master' of https://github.com/Leopard2A5/XFTL.git
fixed camera projection.