fix previous merge (fix submodules?)
Merge branch 'master' of https://github.com/Shedino/Firmware