change the path of db & upload pic.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/classes/config.properties