HotFixing a bug where embedding the framework jar caused a NoClassDefFoundError on update check.
HOTFIX: renaming assets and values to avoid any potential collisions.
Merge branch 'refs/heads/master' into AT_id_alternative