callbacks fixed
Merge branch 'master' of https://github.com/W-General/MNSE

Conflicts:
	app/scripts/background.js