Merge "Add property activity and fragment"