Merge branch 'master' into standard
add property configurer to all context files and add commenting
Merge branch 'standard' into mybatis

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