generate model properties, puzzle
add gem
routing changed
add columns to puzzle, property
update property controller view
fix conflict