update to Elasticsearch 1.4, refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/xbib/elasticsearch/index/mapper/langdetect/LangdetectMapper.java