#2 and upgrade knp menu bundle version
merge remote