Merge branch 'origin/master'
gitignore class, change mysql password, fix url mapping
`Merge branch 'origin/master'

Conflicts:
	WebContent/WEB-INF/Beans.xml