Merge branch 'master' of https://github.com/palepoivre/Series

Conflicts:
	Series.iml