package reorg
auth file
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/mycompany/web/HomeController.java
	src/main/resources/META-INF/spring/mvc-servlet.xml
	src/main/webapp/WEB-INF/jsp/addperson.jsp
	src/main/webapp/WEB-INF/jsp/index.jsp