updata
Merge branch 'master' of github.com:niles2005/mapflow

Conflicts:
	js/CompileContentCtrl.js
Merge branch 'master' of github.com:niles2005/mapflow
updata