Merged AppedidoStoreBundle
- Converted tabs to spaces
- Converted to UTF8 encoding