using the pandas to clear the code
Merge branch 'develop' of https://github.com/yanshixing/dmss into develop

Conflicts:
	veterans/daos.py
	veterans/main.py
	veterans/static/js/controllers.js