Retain scroll state as a part of history
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/com/brandroidtools/filemanager/activities/NavigationActivity.java
Clean up merge