Headers removed
Merge remote-tracking branch 'origin/master' into 2

Conflicts:
	src/main/java/com/ppol/atm/service/impl/CardBlockServiceImpl.java