style fixes/assetmanager fix + added add script function
Merge remote-tracking branch 'origin/master'