Merge branch 'master' of https://github.com/niko2992/networksecurity2014

Conflicts:
	filterproxy/filterproxy.pro.user