Merge branch 'master' of https://github.com/pavel-zrb/srvlog

Conflicts:
	srvlog-service/src/main/java/com/payneteasy/srvlog/service/ILogCollector.java
	srvlog-web/src/main/java/com/payneteasy/srvlog/wicket/page/BasePage.html
	srvlog-web/src/main/java/com/payneteasy/srvlog/wicket/page/BasePage.java