First update of the proposal

Maybe @alexm, @diegok and @salva could take a look. What I'm doing basically is to fix and make neater, updating stuff to next year, and also incorporate the questions that were asked last year into the main proposal so that, basically, it's answered.