-added the main sort function and new setters (colon error fixed)
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
-added get_media_info function
Merge remote-tracking branch 'origin/master'

Conflicts:
	filebottool/pyfilebot.py
-Begin work on UI
-Fixed bug in database checker