formatting cleanup
menu data structure refactoring: no dummy root node
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
	src/org/geometerplus/android/fbreader/MenuData.java
Merge branch 'ice-cream-sandwich' into beta-ics
synchronization with beta branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/MenuData.java
	src/org/geometerplus/android/fbreader/api/ApiServerImplementation.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
menu data list implementation
node set implementation
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/MenuData.java
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/MenuData.java
Merge branch 'beta' into beta-ics

Conflicts:
	src/org/geometerplus/android/fbreader/MenuData.java
Merge branch 'ice-cream-sandwich' into beta-ics
synchronization with beta branch
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
Merge branch 'master' into beta