Geile JSON Parser Shice
v315
Signed-off-by: smooms <smooms@gmx.de>
Signed-off-by: SteffenKrohn <krohn.steffen@t-online.de>
Merge branch 'master' into jsk

Conflicts:
	bin/Bugenbook.apk
	bin/classes.dex
	bin/classes/de/filalisoft/bugenbook/FullscreenActivity.class
	bin/resources.ap_
	src/de/filalisoft/bugenbook/FullscreenActivity.java

Signed-off-by: SteffenKrohn <krohn.steffen@t-online.de>
Merge branch 'jsk' of https://github.com/SteffenKrohn/BugenApp into jsk

Conflicts:
	bin/classes/de/filalisoft/bugenbook/FullscreenActivity.class
	src/de/filalisoft/bugenbook/TimelineActivity.java

Signed-off-by: SteffenKrohn <krohn.steffen@t-online.de>