better language support + no search item in empty sync catalog
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into microtypography
updated ChangeLog
colon in filename
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into microtypography
fixed work with file names containing ':'
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into microtypography
version => 2.0.6
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
Merge branch 'ice-cream-sandwich' into microtypography
version => 2.0.6
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
Merge branch 'ice-cream-sandwich' into microtypography