Third Version
Merge branch 'slav' of https://github.com/eesyboi/TastyIgniter into slav

Conflicts:
	application/controllers/admin/customers.php
	application/controllers/admin/locations.php
	application/controllers/admin/orders.php
	application/controllers/admin/reservations.php
	application/controllers/admin/settings.php
	application/controllers/admin/staffs.php
	application/controllers/main/account.php
	application/controllers/main/address.php
	application/controllers/main/checkout.php
	application/controllers/main/details.php
	application/controllers/main/inbox.php
	application/controllers/main/login.php
	application/controllers/main/logout.php
	application/controllers/main/orders.php
	application/controllers/main/password_reset.php
	application/controllers/main/register.php
	application/controllers/main/reservations.php
	application/controllers/main/specials.php
	application/language/english/main/checkout_lang.php
	application/libraries/Currency.php
	application/libraries/Location.php
	application/libraries/User.php
	application/models/customers_model.php
	application/models/orders_model.php
	application/models/reviews_model.php
	application/models/specials_model.php
	application/models/staffs_model.php
	application/views/admin/categories_edit.php
	application/views/admin/customers.php
	application/views/admin/customers_edit.php
	application/views/admin/location_edit.php
	application/views/admin/locations.php
	application/views/admin/orders.php
	application/views/admin/orders_edit.php
	application/views/admin/reservations.php
	application/views/admin/settings.php
	application/views/admin/staffs.php
	application/views/admin/staffs_edit.php
	application/views/main/address.php
	application/views/main/details.php
	application/views/main/inbox.php
	application/views/main/order_email.php
	application/views/main/orders.php
	application/views/main/password_reset.php
	application/views/main/reservations.php
	application/views/main/specials.php