Manual merge for bag Size fix

Manual merge due to odd merge conflict i could not figure out. Closing
branch soon.
Fixing slight issue with screen animation

Fixing issue with some miss placed brackets before i branch off, Yes i
know its being gutted you can kill me later Flip.
Fixed some issues with the code editor and removed some GHM debugging.
Merge pull request #9 from Pilus/master

merge master into 445 to get it up to date.