enabling plotting of picks in dayplot
changelog
Merge branch 'master' into dayplot_picks

Conflicts:
	CHANGELOG.txt
	obspy/imaging/waveform.py
Merge pull request #547 from megies/dayplot_picks

enable plotting of picks in dayplot