* hot reload of filter files
* blacklist.txt renamed to block.txt
* block.txt and transform.txt moved from QRC to filesystem
beautify proxyfilter.pro
moved most of the code from main to a new class FilterProxyApp
UI-Network now builds on linux
Merge branch 'master' of https://github.com/niko2992/networksecurity2014
Merge branch 'master' of https://github.com/niko2992/networksecurity2014

Conflicts:
	filterproxy/filterproxy.cpp