using Gradle
created gradle wrapper
Configured gitignore
Merge branch 'dev' into getWordJsonWithSpring

Conflicts:
	.classpath