new sql update
Merge branch 'master' of github.com:AlloVince/eva-engine
Merge branch 'master' of github.com:AlloVince/eva-engine
update front lib
Merge branch 'master' of git://github.com/AlloVince/eva-engine into epic

Conflicts:
	public/static/lib