fix bug 2: when on the bottle_form.php hitting cancel taks you back to keg list not my bottles
fix bug 3: Deleting a bottle from the bottle list give a message of Keg successfully deleted, should say bottle.
fix Bug 4 AND other unreported broken functionality on the shelf_list