Finished weekly merge.
Merge branch 'develop' of https://github.com/Soetnowzen/SmartPower into develop