3.1.1 sway.fm fixed, multiple sub-folder fix
3.1.1 additional bug fixes
Merge remote-tracking branch 'krh5058-master/master' into develop

Conflicts:
	js/controllers/library.js