Merge remote-tracking branch 'origin/error' into error

Conflicts:
	src/com/axis/rtspclient/SDP.as
Merge branch 'error' of https://github.com/LingoLasse/locomote-video-player into error