merge
Merge branch 'master' of https://github.com/Zuohr/ifb.git

Conflicts:
	ifb/WebContent/index.html