fixed errors Y.Y
fixed errors
merge
Merge branch 'master' of https://github.com/cs192-s2-2013/kompyutersaiyans

Conflicts:
	uPortalSpringJDBC/WebContent/WEB-INF/jsp/hello.jsp