Merge proposals dependent on lp:~marco-sanchez/trunk-restaurant-addons/trunk-restaurant-addons

1. trunk-restaurant-addons
2. Dependent merge proposals