naming convention
folder list dialog layout
Merge branch 'master' into dm
introduced FolderListDialogActivity class
year
Merge branch 'master' into dm

Conflicts:
	src/org/geometerplus/android/util/FolderListDialogActivity.java
formatting
code clarification
synchronization with dm branch
Merge branch 'master' into dm
Activity => ListActivity
Activity => ListActivity
Merge branch 'master' into dm

Conflicts:
	src/org/geometerplus/android/util/FolderListDialogActivity.java
unused field
code cleanup
synchronization with dm branch
Merge branch 'master' into dm

Conflicts:
	src/org/geometerplus/android/util/FolderListDialogActivity.java
renaming
FileChooserUtil.runFolderListDialog()
Merge branch 'master' into dm

Conflicts:
	src/org/geometerplus/android/util/FileChooserUtil.java