Merge branch 'master' of git://github.com/AlloVince/eva-engine into epic
submodule
register user id min-length to 5
event calendar
Merge branch 'master' of github.com:AlloVince/eva-engine
Merge branch 'master' of git://github.com/AlloVince/eva-engine into epic
event calendar
Merge branch 'epic' of https://github.com/xuqian/eva-engine into epic

Conflicts:
	public/static/lib