Merge branch 'hotfix/manifest2'
Merge branch 'release/manifestupdated'
manifest v0.1.2
resolved merge conflict manifest.cache
resolved merge conflict manifest.cache again
changed localhost to roster-multicap...
proper manifest with url not localhost
Merge branch 'develop' of github.com:Michieljoris/roster into develop
Merge branch 'hotfix/propermanifest'
Merge branch 'hotfix/propermanifest' into develop
fixe manifest, put urls in it
Merge branch 'release/manifestfix'
Merge branch 'release/manifestfix' into develop
Merge branch 'master' into develop
Progress bar while loading the cache
added nonexisting gif files to skins
Bumped version number
Merge branch 'release/progressbar' into develop