add by 108
Merge branch 'master' of https://github.com/freddie218/bbs_team_b

Conflicts:
	prepare_database.sh
	src/main/resources/database.properties
	src/main/webapp/WEB-INF/views/user/profile.jsp