AEROGEAR-1006 fixes

AEROGEAR-1006 fixes

AEROGEAR-1006
Merge branch 'AEROGEAR-1006' of https://github.com/sebastienblanc/aerogear-controller into AEROGEAR-1006