Commit per pull
Merge branch 'master' of https://github.com/rexos/kokko
Admin side and minor
Merge branch 'master' of https://github.com/rexos/kokko
Merge branch 'master' of https://github.com/rexos/kokko