unit test
Merge branch 'master' of
https://github.com/e0828330/operationManager.git

Conflicts:
	operationManager/src/test/java/webGui/TestSimplePage.java