switched to ElasticSearch v1.2.0
Merge branch 'master' of github.com:backmeup/themis-service

Conflicts:
	backmeup-model/src/test/java/org/backmeup/model/tests/SerializiationTest.java
	pom.xml