Build .05

Added reset button. Soon TBD: Fix calculations behind actual BPM
TestCommit
Merge branch 'Alex' into Leon
Merge branch 'Leon'

Conflicts:
	Sample Android App/.metadata/.mylyn/.tasks.xml.zip
	Sample Android App/.metadata/.mylyn/tasks.xml.zip
Test