v2
Merge branch 'master' of https://github.com/billyshena/Apps.git

Conflicts:
	AppsFree/WebContent/WEB-INF/header.jsp
l