add  class factory
add aop
Merge remote-tracking branch 'origin/master'

Conflicts:
	ParamFilter.php