Merge branch 'master' into spring
#12 gradle wrapper
#13 application.properties
Merge branch 'spring'