.
Merge branch 'design' into gh-pages
Merge branch 'design' of github.com:coyotte508/webclient into design

Conflicts:
	js/index.js
Merge branch 'design' into gh-pages
Merge branch 'gh-pages' of github.com:coyotte508/webclient into gh-pages