Merge branch 'master' of https://github.com/pjsong/rujin-parent

Conflicts:
	.gitignore
	rujin/.gitignore
Merge branch 'master' of https://github.com/pjsong/rujin-parent