English
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 resources
Merge branch 'master' into ice-cream-sandwich
synchronized resources
Merge branch 'master' into beta

Conflicts:
	assets/resources/application/be.xml
	assets/resources/application/bg.xml
	assets/resources/application/cs.xml
	assets/resources/application/de.xml
	assets/resources/application/el.xml
	assets/resources/application/es.xml
	assets/resources/application/eu.xml
	assets/resources/application/fa.xml
	assets/resources/application/fr.xml
	assets/resources/application/gl.xml
	assets/resources/application/hu.xml
	assets/resources/application/hy.xml
	assets/resources/application/it.xml
	assets/resources/application/ka.xml
	assets/resources/application/nb.xml
	assets/resources/application/nl.xml
	assets/resources/application/pl.xml
	assets/resources/application/pt.xml
	assets/resources/application/ro.xml
	assets/resources/application/ru.xml
	assets/resources/application/sr.xml
	assets/resources/application/th.xml
	assets/resources/application/tr.xml
	assets/resources/application/uk.xml
	assets/resources/application/vi.xml
	assets/resources/application/zh.xml
	assets/resources/application/zh_TW.xml
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
Russian resources
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
plugins.xml file
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics