fixx bugs
Merge branch 'master' of https://github.com/huynt57/bluebee.com