db & submodule
newsletter & user
event calendar
Merge branch 'master' of github.com:AlloVince/eva-engine
user
use friend
Merge branch 'master' of github.com:AlloVince/eva-engine

Conflicts:
	data/database/update20120927.sql
add user ready for js
fix user friend count
newsletter layout
remove auto friend
zflab new db example
Merge branch 'master' of github.com:AlloVince/eva-engine
add rule for cancel request
news letters
user & newsletter
user & newsletter
add local config for EvaImage
Merge branch 'master' of github.com:AlloVince/eva-engine
collect local configs