-
Merge branch 'master' of github.com:sundowndk/Didius

Conflicts:
	Binary/AppDebug/Didius.dll
	Binary/AppDebug/app/Didius/chrome/content/js/didius.js
	Binary/AppDebug/app/Didius/chrome/content/js/sndk/js/sndk.js