updated ui changes
Merge branch 'master' of https://github.com/sagittaros/booking_www

Conflicts:
	booking_www.esproj/user.mac.espressostorage