changes from 8/2/2014
Merge remote-tracking branch 'origin/master' into vs2010

Conflicts:
	liveMedia/RTSPCommon.cpp

merge changes from 8/2/2014