added 'stop' functionality (not added to ui)
Merge pull request #34 from wlabranche/feature/stop

added 'stop' functionality (not yet added to ui)
Merge pull request #36 from gMajr/dev

Dev
Merge pull request #39 from gMajr/dev

Installs devDependencies
Merge pull request #43 from gMajr/dev

Deploy with columns of playing grid showing they are being played.
Merge pull request #50 from gMajr/dev

Deploy - dev to master
Merge pull request #56 from gMajr/dev

Dev
Merge pull request #57 from onetruebob/feat/StopPlayOnNavigate

Removed unneeded injection of $sideMenuDelegate
Revert "Removed unneeded injection of $sideMenuDelegate"
Merge pull request #59 from gMajr/revert-57-feat/StopPlayOnNavigate

Revert "Removed unneeded injection of $sideMenuDelegate"
Merge pull request #68 from gMajr/dev

Deploy - dev to master
Merge branch 'master' of https://github.com/gMajr/gMajorMobile into dev

Conflicts:
	www/js/controllers/gridController.js
Merge branch 'dev' of https://github.com/gMajr/gMajorMobile into dev
Merge branch 'dev' of https://github.com/gMajr/gMajorMobile into dev
fixed minor local bug
refined login
Merge branch 'dev' of https://github.com/gMajr/gMajorMobile into dev
Merge branch 'dev' of https://github.com/gMajr/gMajorMobile into dev

Conflicts:
	www/js/controllers/gridController.js
login checked in $scope
Merge pull request #92 from villanuevawill/bug/addNewSong

Music stops playing when adding a song to the chat