minor
Merge branch 'master' of https://github.com/Jeremy-WEI/SFCU-3.0

Conflicts:
	public/uploads/alapp/alapp.zip
	public/uploads/alapp/alapps_file.csv
	public/uploads/cbpapp/cbpapp.zip
	public/uploads/cbpapp/cbpapps_file.csv
	public/uploads/maapp/maapp.zip
	public/uploads/maapp/maapps_file.csv
	public/uploads/ulapp/ulapp.zip
	public/uploads/ulapp/ulapps_file.csv