Getting Started without spring boot
Merge remote-tracking branch 'origin/master'