add ignore file
change to mysql
Merge branch 'master' of git@github.com:wuzhengyu/springside4.git

Conflicts:
	examples/quickstart/pom.xml
	examples/quickstart/src/main/resources/application.properties