Small refactoring for entities + added log4j.properties.
Fixed table table for AuthorityJdo
Merge remote-tracking branch 'origin/master'

Conflicts:
	finance/service/src/main/java/com/lavida/service/Main.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	finance/service/src/main/java/com/lavida/service/Main.java