Merge branch 'master' of ssh://github.com/Moove-it/evangelion

Change-Id: Ic8577b15f2fa7ebcc47620cb61e9682916a25376