Improved environment selection on Console Page
Merge branch 'master' of https://github.com/erincinci/magepanel

Conflicts:
	routes/mage.js