Added pause and resume functionality for the timeline
Merge branch 'jae'

Conflicts:
	BeatBox/src/com/beatboxmetronome/MetronomeFragment.java