Merge origin/master

Conflicts:
	addon.xml
	cookies/alekino.cookie
	default.py
	host/alekino.py
	host/alekinoseriale.py
	nbproject/project.properties
	nbproject/project.xml
	resources/lib/language/English/strings.xml
	resources/lib/language/Polish/strings.xml
	resources/lib/libCommon.py
	resources/lib/pCommon.py
	resources/lib/pageparser.py
	resources/lib/settings.py
	resources/lib/urlparser.py