initial changes made
Changes to the wifi show/edit page
user accordian updated
Merge branch 'move_data_points_from_review_to_wifi' into dev
merge conflicts on user show page resolved