version 0.9.0
Merge pull request #525 from giastfader/master

merge 0.8.4 into master
fix conflict
Merge branch 'baasbox-master' into ios8-push