refine with ES ver1.4.1
Merge branch 'master' of https://github.com/Terry-Shi/elasticsearch.git

Conflicts:
	src/main/java/com/elasticsearch/tutorial/EmbeddedNodeClient.java
	src/main/java/com/elasticsearch/tutorial/Transport.java