router.js
Merge branch 'master' of https://github.com/gnowledge/pandora-mobile-app

Conflicts:
	app/scripts/core/router.js