update
Merge branch 'master' of github.com:blvp/believe-or-not-believe

Conflicts:
	src/main/java/org/company/dedco/bonb/controller/MainController.java
	src/main/java/org/company/dedco/bonb/service/impl/StatisticServiceImpl.java