fixed viewport bug
resolved merge conflicts
added new bgs
Merge branch 'master' of github.com:fin-ger/cg-st-adv