Change getEntity to get
Update BillyPortugal with contexts and customers.
Merge branch 'misc-fix' into develop