merge master
Merge branch 'lkab' into lkab-mar14
add gender, remove deliver_to
add gender validation
WIP: user activation scenario
display the inactive user warning
add city_name field, get inactive users cli task
cli tool: update card balance, activate user
extract inactive users by date
Merge branch 'lkab-mar14'