Added jrebel so can be faster in development
Merge remote-tracking branch 'origin/master'