Fix error in template creation.
Merge branch 'master' of https://github.com/ingarabr/metric-insights

Conflicts:
	src/main/java/com/github/ingarabr/mi/ServerService.java
Upgrade elasticsearch to 1.3.2