meh
Merge branch 'develop' of github.com:egloo/eglooframework into develop