Merge branch 'master' into diablo

Conflicts resolved:
	debian/changelog
	debian/control
	src/SeriesFinale/gui.py
	src/SeriesFinale/lib/constants.py

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch diablo
# Your branch is ahead of 'origin/diablo' by 9 commits.
#
# Changes to be committed:
#   (use "git reset HEAD^1 <file>..." to unstage)
#
#	modified:   debian/changelog
#	modified:   src/SeriesFinale/gui.py
#	modified:   src/SeriesFinale/lib/constants.py
#	modified:   src/SeriesFinale/lib/serializer.py
#	modified:   src/SeriesFinale/lib/thetvdbapi.py
#	new file:   src/SeriesFinale/lib/util.py
#	modified:   src/SeriesFinale/series.py
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	build-stamp
#	build/
#	configure-stamp
#	debian/files
#	debian/seriesfinale/
#	src/SeriesFinale/0001-Mark-already-added-series-when-searching.patch
#	src/SeriesFinale/__init__.pyo
#	src/SeriesFinale/lib/__init__.pyo
#	src/SeriesFinale/lib/constants.pyo
