fixed audio waveform for 0071
Merge branch 'develop-0071' of github.com:Flightphase/ofxTimeline into develop-0071
Merge remote-tracking branch 'origin/develop-0071'
fixed video player load
Merge remote-tracking branch 'origin/develop'

Conflicts:
	example-audiowaveform/audiowaveformTimelineExample.xcodeproj/project.pbxproj
	example-audiowaveform/bin/data/_defaultPage_elementPositions.xml
	example-audiowaveform/bin/data/defaultTimeline__zoomer.xml
	example-audiowaveform/src/testApp.cpp
	example-audiowaveform/src/testApp.h
	example-simpledemo/bin/data/_defaultPage_elementPositions.xml
	example-simpledemo/bin/data/rotatex.xml
	example-simpledemo/bin/data/rotatey.xml
	example-videoplayer/timelineExampleVideoPlayer.xcodeproj/project.pbxproj
	libs/ofOpenALSoundPlayer_TimelineAdditions/ofOpenALSoundPlayer_TimelineAdditions.cpp
	src/ofxTLAudioWaveform.cpp
Merge remote-tracking branch 'origin/develop'
003 release

Conflicts:
	example-audiowaveform/bin/data/GUI/defaultColors.xml
deleted stray file
Merge branch 'develop' of github.com:YCAMInterlab/ofxTimeline
stray keyframes fixed
fixed frame based ticker display
dampened camera
fixes to color track lost keyframe
Merge branch 'refs/heads/develop'
added jumpToTarget() to camera track
fix for legacy video player
fix to video player play
deleted build files from timeline example
updated audio waveform example
audio track default bins rename
bangs now trigger even if not playing
added background color and default colors to gui