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

Conflicts:
	SourceCode/AndroidManifest.xml
	SourceCode/src/at/fhooe/mhs/bloody/MainActivity.java
Merge branch 'master' of https://github.com/JosefRieseneder/Bloody

Conflicts:
	SourceCode/AndroidManifest.xml
	SourceCode/src/at/fhooe/mhs/bloody/activities/MainActivity.java