Change for windows
stels
Merge remote-tracking branch 'origin'

Conflicts:
	TeaserMedia.net/addteaser.php
	TeaserMedia.net/cookies.txt
local changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	TeaserMedia.net/addteaser.php
	TeaserMedia.net/cookies.txt
Adding one teaser