synchronization with nook branch
Merge branch 'master' into beta

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