[boshiamy] Version Alpha 1
Merge branch 'boshiamy_im', Version Alpha 1
Merge branch 'master' into develop