official commit
Merge branch 'master' of https://github.com/rshandy/hex

Conflicts:
	js/configure.js