add properties
interceptor added
remove empty lines
adjust the mapper xml's format
Merge branch 'develop'