use friend
Merge branch 'master' of github.com:AlloVince/eva-engine

Conflicts:
	data/database/update20120927.sql