Problems with buttons fixed
Merge branch 'caroline_server' of https://github.com/Chouffe/vichy into caroline_server