from Mr. Fu
Merge commit '5e9578ef7fb02a1110767e05b155c108c618ae9f' into gh-pages

Conflicts:
	vortex.js
fix with JSHint
format