Merge branch 'v0.2.x' of https://github.com/adminion/adminion
Merge branch 'master' into v0.2.x