Merge branch 'master' of github.com:lucascauthen/EZBlock

Conflicts:
	mainwindow.cpp