update ignore list
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.gitignore
test active record plugin in jfinal