code modify for site kabinbure
Merge branch 'master' of https://github.com/saintent/MV_MASTER

Conflicts:
	src/main.cpp