Fixed Compliance rules
Merge branch 'master' of https://github.com/nuboat/Bgile

Conflicts:
	src/main/java/com/thjug/bgile/entity/Cardorder.java
	src/main/webapp/WEB-INF/web.xml