update: not done yet too sleepy
Merge branch 'master' of https://github.com/primetogo/BQ-ON-Website.git