test
Merge remote-tracking branch 'origin/0.5' into 0.5
docker update.
Merge remote-tracking branch 'origin/0.5' into 0.5
add cloud settings, merge apps services, cleanup megam internals
0.5 beta update
Merge pull request #18 from indykish/0.5

0.5 updates