Merge branch 'master' of ssh://git@github.com/humyna/javainspring.git

Conflicts:
	.gitignore
spring dynamic proxy 

Signed-off-by: humyna <hufo125@gmail.com>