Merge pull request #167 from bpross-52n/develop

This fixes #130 and #166 plus some minor issues
Merge pull request #168 from bpross-52n/develop

This fixes #162 and an unknown bug
add phenomenons onyl when they exist
add thread.id to log.
fix NPE on findViewById
Merge branch 'upstream-dev' into develop
Merge pull request #169 from matthesrieke/develop

Develop
NPE fix when calculating MAF.
add log statement to determine why an adapter failed
measurements were added two times! dude, wtf?!
initial TermsOfUse support
initial terms of use integration
terms of use integration finished. needs testing with server backend
remove acceptedTermsOfUseVersion after logout
terms of use rendering improvements
Merge pull request #171 from matthesrieke/develop

Develop
change TermsOfUse endpoint to /dev
fix issue with obfuscation - could delete measurements in the middle
terms of use one register/login
Merge pull request #172 from bpross-52n/develop

New structure for help fragment