updated all the files we need
Merge branch 'master' of https://github.com/Bergunder/Optic-Solutions

Conflicts: