Email options added to config.properties, backend TCP/UP server log full
error message as debug and short description as error
Merge branch 'master' of https://github.com/mff-uk/intlib.git

Conflicts:
	backend/src/main/java/cz/cuni/xrg/intlib/backend/AppEntry.java
OSGI in now properly used as a singleton