Merge remote-tracking branch 'origin/DevEric' into devTom
Merge branch 'devTom'
Merge branch 'master' of https://github.com/Hydrog3n/LogiPro-CShare