login view controller animation to show login button above keyboard
current username shown in logout alert view
Merge branch 'charlie'
added floor plan example for demo
fix merge swap file problem
contact data object and contacts property for buildings
removed unused files
merged floor plan changes
phone number object
contact object with name, position and phone numbers
corrected hydrant parsing to account for differences in Python/ObjC typedef numbering
clear merge swap file to merge james changes