logIn adjust Database ...
Merge remote-tracking branch 'Lou/master'

Conflicts:
	WebApp/src/edu/ycp/cs320/awesomepage/server/LoginServiceImpl.java