google account test
Merge branch 'master' of https://github.com/this88mild7/bsg_pt_movie

Conflicts:
	src/main/webapp/WEB-INF/views/user/login.jsp