Fixed little things
Merge branch 'master' of github.com:Fireozone/GSGB-App