merge
Merge branch 'master' of https://github.com/SquierDotQn/ErlangDashboard

Conflicts:
	ezwebframe/demos/index.html