Changes Casablanca

Pull request for all the changes done during the FIAV festival (Casablanca, 2014).