WIP:Dev

Closed Vitor Lopes requested to merge (removed):dev into dev

Always test my merges, some more minor code clean up.

Edited by Vitor Lopes

Merge request reports