Merge pull request #49 from malenkiki/develop

Develop
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of https://github.com/malenkiki/bah
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of https://github.com/malenkiki/bah
Merge branch 'develop'
Merge branch 'develop'