last commit
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	VisitorBoard/src/main/java/com/board/test/TimeObj.java
	VisitorBoard/src/main/java/com/spring/board/HomeController.java
	VisitorBoard/src/main/webapp/WEB-INF/views/home.jsp
	VisitorBoard/target/classes/com/board/test/HomeController.class
	VisitorBoard/target/classes/com/board/test/TimeObj.class
	VisitorBoard/target/m2e-wtp/web-resources/META-INF/maven/com.board/test/pom.properties