page
Merge branch 'master' of github.com:leonson/smartanws

Conflicts:
	WebContent/header.jsp
Merge branch 'master' of github.com:leonson/smartanws
Merge branch 'master' of github.com:leonson/smartanws
Adding page