Merge branches 'development' and 'documentation' of https://github.com/ngmon/ngmon into development

Conflicts:
	core/src/main/java/cz/muni/fi/xtovarn/heimdall/Application.java
	core/src/main/java/cz/muni/fi/xtovarn/heimdall/collector/SocketCollector.java
	core/src/main/java/cz/muni/fi/xtovarn/heimdall/dispatcher/Dispatcher.java
	core/src/main/java/cz/muni/fi/xtovarn/heimdall/pipeline/handler/ParseJSON.java
	core/src/main/java/cz/muni/fi/xtovarn/heimdall/pipeline/handler/Store.java
* CRLF
* todo added
Merge remote-tracking branch 'origin/development' into development