added floor plan example for demo
fix merge swap file problem
merged floor plan changes