Merge pull request #21 from MaxMEllon/develop

merge: develop -> master
Merge pull request #22 from MaxMEllon/develop

merge: develop -> master
Merge pull request #23 from MaxMEllon/develop

merge: develop -> master
Merge branch 'master' of github.com:MaxMEllon/AppBox into develop
Merge pull request #26 from MaxMEllon/develop

merge: develop -> master
Merge branch 'master' of github.com:MaxMEllon/AppBox into develop