Fix scrolling
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	AgatteClient/src/main/java/com/agatteclient/MainActivity.java