update the project name
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
Merge remote-tracking branch 'origin/master'
remove default role id 2
Fix bugs