some bug fixed
start work on loader
Merge branch 'master' into WikiBlocks