==
==
group id 改为 net.paoding
Merge branch 'master' of bitbucket.org:zhegexiaohuozi/paoding-rose

Conflicts:
	rose/pom.xml
==
Merge branch 'master' of github.com:zhegexiaohuozi/paoding-rose