changed constant
Merge branch 'master' into tags-master
additional constants
Merge branch 'master' into tags-master
synchronization with auth branch
Merge branch 'master' into tags-master
synchronization with auth branch
Merge branch 'master' into tags-master
synchronization with auth branch
Merge branch 'master' into tags-master

Conflicts:
	AndroidManifest.xml
default (empty) implementation of ZLNetworkRequest.handleStream()
Merge branch 'master' into tags-master
synchronization with auth branch
Merge branch 'master' into tags-master
synchronization with auth branch
Merge branch 'master' into tags-master
synchronization with auth branch
Merge branch 'master' into tags-master