add edit button to experience point show page
removed line from student show
minor changes
updated association view for student's parent in student form, updated user association in offerings form so only teacher and teaching assisstant names appear
Updated changes to relect master.
add robotics information to student view
fixed conflicts