modified profile controller
merged files and updated some files