add workspace parent pom & ws folder
Merge pull request #182 from leoliang/master

add workspace parent pom & ws folder
refactor
Merge pull request #183 from leoliang/master

refactor
tuning
Merge pull request #184 from leoliang/master

sql tuning
add workspace startup script
parent pom add container
refactor
Merge pull request #186 from leoliang/master

add workspace startup script
for leo to sync
Merge pull request #187 from marsqing/master

for leo to sync
Merge branch 'master' of https://github.com/dianping/phoenix into dianping-master

Conflicts:
	phoenix-dev/src/main/resources/META-INF/plexus/components.xml