fix merge bug
Merge branch 'dev' of https://github.com/tinhtooang/balloonatic into dev