Update based on puphpet
Build 2 based on puphet
Version sent to Rui and working on Linux => Still some todos
Added default site