Merge branch 'basic' of github.com:kgleong/spring-mvc-template into basic
move to programmatic web app initializer (previously xml based in web.xml)
add basedir to resources path
add spring aop and aspect template class
deletes web.xml in favor of java configuration.  updates readme
Merge branch 'master' into standard

Conflicts:
	pom.xml
	src/main/java/com/orangemako/spring/config/ApplicationConfig.java
	src/main/java/com/orangemako/spring/config/DispatcherConfig.java
	src/main/webapp/WEB-INF/web.xml
dispatcher config revert
Merge branch 'standard' into mybatis

Conflicts:
	src/main/java/com/orangemako/spring/config/ApplicationConfig.java
add sql scripts