'xx'
'xx'
xx
xxx
xxx
change .gitignore file
Merge branch 'alading_v0.0.1'

Conflicts:
	.gitignore
	alading/pom.xml
	alading/src/main/java/com/chinarewards/alading/module/ServletsModule.java
	alading/src/main/webapp/WEB-INF/jsp/view/card/cardShow.jsp
	alading/src/main/webapp/WEB-INF/jsp/view/card/cardUpdate.jsp
	alading/src/main/webapp/WEB-INF/jsp/view/cardImage/listCardImage.jsp
add jce dependency to pom.xml