store
Merge branch 'master' of https://github.com/DavidRen/flash

Conflicts:
	hls-osmf-1st/.actionScriptProperties
	osmf/bin-debug/osmf.swf
	osmf/src/osmf.as
	seperate2/bin-debug/seperate2.swf
jjj