Updated ui
Merge branch 'gh-pages' of https://github.com/hsalemwalla/WEC into gh-pages

Conflicts:
	index.html
	js/ui.js
Merge branch 'gh-pages' of https://github.com/hsalemwalla/WEC into gh-pages
test