Sorting
Merge branch 'master' of https://github.com/castillobg/sound-point

Conflicts:
	public/js/controllers/stationCtrl.js