bla
Merge branch 'master' of https://github.com/JosefRieseneder/Bloody
charts
Merge branch 'master' of https://github.com/JosefRieseneder/Bloody

Conflicts:
	SourceCode/res/values/strings.xml
	SourceCode/src/at/fhooe/mhs/bloody/activities/MainActivity.java
	SourceCode/src/at/fhooe/mhs/bloody/activities/MeasurementActivity.java