update 6,7,14,15
Merge branch 'master' of https://github.com/anggimharahap/Sisbro