synchronization with nook branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	assets/resources/application/en.xml
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
synchronization with nook branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
updated text
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics