Profile page - Server connection
moved all files from website to .
replaced ../ with ./
Deleting some unused files
Merge dev and master