adding some forgotten changes :D
fixed deprecated warning
added a jrebel profile
Merge remote-tracking branch 'refs/remotes/origin/feature-productivity' into devel