Merge branch 'master' of https://github.com/bito4ek/jPlainCms
adding log4j
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/bit/cms/core/filter/DebugFilter.java
Merge branch 'master' of https://github.com/bito4ek/jPlainCms
adding log4j