Merge pull request #94 from openchange/master

Merge last changes from upstream
Merge remote-tracking branch 'oc/master'
make: mapistore_test needs to link against libmapi.so
Merge pull request #92 from Zentyal/jgarcia/fix-make-mapistore_test

Makefile: fix make mapistore test