Merge pull request #249 from alexmckenley/dev

Whitespace cleanup
refactored shuffle to call toggleShuffle()
split up play() into multiple functions, and shuffle as well
Time and createSongObject refactor
split up playNext and playPrev into multiple functions
Rdio search refactor
Merge pull request #250 from nickescallon/dev

Split all long functions in player controller into multiple smaller functions
Even more rdio refactor
Refactor youtube search
Removed comments
Merge branch 'refactor' into dev

Conflicts:
	public/scripts/services/search.js
Fixed search
Merge pull request #251 from deini/dev

Refactor SearchService