Tuesday
add files from Mihai
fix merge conflicts, brutally
Name page working
Merged with Mihai's files
Merge