7.8.2015 laptop
zlap fixed merge jabref