jsmin
cssmin
依赖注入 fix
angular.js min
Merge branch 'master' into gh-pages

Conflicts:
	DBFS/js/main.js
add ie9- error-display
add images
haha
修复 astar name
Merge branch 'master' into gh-pages
fix merge