Merge branch 'hotfix/0.1.6'
Merge branch 'master' of github.com:sdayu/pumbaa into develop
Merge branch 'develop' of github.com:sdayu/pumbaa into develop
add simple photo albums module