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

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

Conflicts:
	project.properties
default (empty) implementation of ZLNetworkRequest.handleStream()
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into microtypography
synchronization with auth branch
Merge branch 'master' into ice-cream-sandwich