Clean up data loading
Merge remote-tracking branch 'origin/master'

Conflicts:
	sample/assets/xml/sample_structure.xml
	sample/bin/Flash11/stripDisplay.xml
Update stripDisplay.xml