merged with upstream/master
fixed commit id
 fixed modules
preparation for 14.07
merged upstream
switched to expermimental branch of our packages