refresh whiteboard
Merge branch 'develop' of https://github.com/johnnyzh82/whiteboard into develop

Conflicts:
	war/WEB-INF/web.xml