Merge branch '2.3.x' into devel
Merge branch '2.3.x' into devel
CC-4887: Show whether track is scheduled in the future on Library page
CC-4887: Show whether track is scheduled in the future on Library page
Merge branch 'cc-4887-show-whether-track-is-scheduled-in-the-future-on-Library-page' into devel
CC-4886: Warn if track is part of a playlist when deleting from library.

-done
Removed html from Library/contents-feed and StoredFile model
Added new Library column to indicate if a file is scheduled in the future or belongs to a playlist/smart block
CC-4900: Indicate in the library if a webstream is scheduled in the future or belongs to a playlist

-done
CC-4902: Library -> Status column does not update when you add a file to a show

-fixed
CC-4903: Library -> Show/hide columns -> Status Column needs label

-fixed
CC-4895: Remove all json die() statements from code
CC-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist
CC-4904: Library -> Sort by status doesn't work

- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
Merge branch '2.3.x' into devel

Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/models/StoredFile.php
CC-4914: Update is_scheduled after tracks play out

-done
CC-4920: Now Playling js error

-fixed
Merge branch 'devel' of https://github.com/sematuszewski/Airtime into devel
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
CC-4895: Remove all json die() statements from code

- removed json_encode
Removed log message