Kai - removed the KVO from the Front Line tools view controller
Merge pull request #741 from acres4/feature/shepherdFileReadBackground

Shepherd - moved a file read off of the main thread
Merge pull request #739 from acres4/feature/beverageIntCasting

Bringing int casting Juliet hotfix change to Lima
Merge pull request #740 from acres4/feature/missingCallSlotPickerXib

Bringing missing xib change into Lima
Kai - removed unnecessary cruft
Merge pull request #742 from acres4/feature/userPreferences

Feature/user preferences
Kai - fixed a crash when searching and user with no roles was present in the search results, cleaned up some cruft
Merge pull request #743 from acres4/feature/userSearching

Kai - fixed a crash when searching and user with no roles was present in the search results, cleaned up some cruft
Merge branch 'rc/juliet' into feature/mergeJulietIntoKilo

Conflicts:
	talk
Merge pull request #744 from acres4/feature/mergeJulietIntoKilo

Feature/merge juliet into kilo
Merge branch 'rc/kilo' into feature/mergeKiloIntoLima
Merge pull request #745 from acres4/feature/mergeKiloIntoLima

Feature/merge kilo into lima
Kai - now hiding the call announce switch and label in iOS 6
Merge pull request #746 from acres4/feature/hideCallAnnounceIos6

Kai - now hiding the call announce switch and label in iOS 6
Shepherd - fixed an issue that would cause more specific build lists to blow away data related to other applications
Shepherd - Removed 'X Builds' subtitle from application list in preparation for when that data is no longer available
Merge pull request #747 from acres4/feature/12Builds

Shepherd - No longer says "12 builds" for every application
Merge pull request #748 from acres4/feature/shepherdBuildsBlownAway

Shepherd - download builds of one app no longer erases all other apps' build data
Kai Demo - updated some of the logged in users to be on different types of calls
Merge pull request #749 from acres4/feature/demoUpdates

Kai Demo - updated some of the logged in users to be on different types of calls