Create gh-pages branch via GitHub
Merge branch 'master' into gh-pages

Conflicts:
	index.html
Merge branch 'gh-pages' of https://github.com/nexcore/alopex-ui into gh-pages
idx