a
Merge branch '0.6.0' of https://github.com/baasbox/docs into 0.6.0