update version
7/4/2014 changes
Merge branch 'master' into vs2010

Conflicts:
	liveMedia/RTSPCommon.cpp

changes from 7/2/2014