added es translation
moving forward to 0.2-SNAPSHOT
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/pom.xml