Merge branch 'develop' of github.com:lucifurious/kisma
Merge branch 'master' of github.com:lucifurious/kisma