update .gitignore
Merge pull request #50 from 559210/master

rename memory.h files for compiling error in Android.
fix jansson deps android.mk
auto-reconnect: add auto reconnect feature
client: add interface to pomelo.h
client: do some optimization
client: fix pc__client_reconnect bug
Merge branch 'master' into debug
fix memory.h
update android.mk
*: initialize state_mutex
Merge pull request #55 from herofj/auto-reconn

auto-reconn: fix bug that state_mutex is not initialized
Merge branch 'master' into auto-reconn
Merge branch 'master' into upgrade-uv
upgrade uv to 0.10.27

re-apply: commit 00f92a
re-apply: commit 2e61cd

Conflicts:

	Android.mk
	deps/uv/uv.gyp
	pomelo.gyp
reconn: randomize the delay for reconnecting back off
Merge branch 'master' into auto-reconn

Conflicts:
	.gitignore
update libpomelo

some change for protobuf
Update poroto define

Update some poroto define
issue #58
Merge pull request #58 from mrFranklin/master

client: fix a proto bug and do some optimization