new html pages
conflict fixed
changes to studentprofile
clean up student html page
Merge branch 'student_view'