Kai Beverage - change to display count of drinks instead of count orders
Kai Beverage - fixed display of add-on items
Merge pull request #529 from acres4/feature/drinkCounts

Feature/drink counts
Merge pull request #530 from acres4/feature/noMagicStrings

Kai Beverage - fixed display of add-on items
Kai Beverage - added missing category when creating labels
Merge pull request #531 from acres4/feature/missingDescriptionForCategory

Feature/missing description for category
Hoover - changed the hotkey to focus on the search field for entries so that the raw message searching works
Hoover - hopefully fixed the build issue with Jenkins, frameworks needed to be relative to build products did
Hoover - added notification when pruning completes so the conversation table is properly updated
Hoover - added check for updates now option from the main menu
Hoover - fixed issue with gists not being available if the user logged in and their name was not exactly as it appears on GitHub
Merge branch 'rc/juliet' into feature/hooverToTheCoreData

Conflicts:
	ios/NetJSON/NetJSON/NSDate+Tools.h
	ios/NetJSON/NetJSON/NSDate+Tools.m
Kai Beverage - fixed andrew deep, needed to clear the newMenuItem after using it
Kai Beverage - change comparison of two drink items to consider the tender type
Merge pull request #533 from acres4/feature/itemDuplicateWithComment

Duplicate menu item when adding a comment
Merge pull request #534 from acres4/feature/fixDrinkConsolidation

Feature/fix drink consolidation
Kai Beverage - fixed multiple issues stemming from using the wrong array when selecting items from the alpha sort view
Kai Beverage - fixed regression caused by [bc6c141], caused the user to not be able to add more than one drink to an order
Merge pull request #535 from acres4/feature/fixAlphaItemSelection

Feature/fix alpha item selection
Merge pull request #536 from acres4/feature/itemSaving

Beverage Item Saving