Merge remote-tracking branch 'jira/design' into gh-pages
Merge branch 'design' into gh-pages
Merge branch 'design' into gh-pages
Merge branch 'design' into gh-pages
Merge branch 'design' into gh-pages
Merge branch 'design' into gh-pages
changed base url of ghpages
Merge branch 'design' into gh-pages
Merge branch 'design' into gh-pages
Merge branch 'design' into gh-pages

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

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