1.Add javax.servlet
2.Add lombok.jar
3.Add c3p0 Remove dbcp
Use C3P0 Data source
Add properties
Update something
Rename
修改数据库表明，procedure与mysql有冲突，改为procedures
Commit Something
Add Security Entitys
Add Security Entitys
Rename EntityBase to BaseEntity
Commit Something
Commit Something
Commit Something
Commit Something
Commit Something
Commit Something
Merge remote-tracking branch 'origin/dev_taohuan' into dev
Merge remote-tracking branch 'origin/dev' into dev_lijun

Conflicts:
	src/resources/spring/beans.xml