change
Merge branch 'master' of https://github.com/hankchan/bbb_hs_ev_app

Conflicts:
	config/hs_bbb.conf