Refactored to make launcher actviity which starts service which then manages sensors and other activities
ignore tasks.xml as described here https://intellij-support.jetbrains.com/entries/23393067
added de-dupe on heartrate values and fixed handler code in SensorService that extracted heartrate value
Fixed display of heart rate data on mobile
Merge remote-tracking branch 'upstream/master'
Added jairo's UI
integrated Carl's changes - no test yet
updated permissions
last version before demo - data api code commented out
jairo ui
comment out heartrate update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	mobile/src/main/java/com/emoware/emoware/FragmentOne.java
	mobile/src/main/java/com/emoware/emoware/Main.java
	mobile/src/main/res/layout/activity_main.xml
	mobile/src/main/res/layout/fragment_one.xml
	mobile/src/main/res/layout/rowlayout.xml