Fix server may undefined...
Merge branch 'master' of github.com:windyarts/satan

Conflicts:
	app/scripts/services/common/dev.js