changed constant
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
additional constants
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
synchronization with auth branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
synchronization with auth branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
synchronization with auth branch
Merge branch 'master' into ice-cream-sandwich

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

Conflicts:
	project.properties
Merge branch 'yota2' into kindle