Merge pull request #16 from abinitgui/master

Having develop branch and master branch up to date
Merge pull request #17 from abinitgui/develop

Merge pull request #16 from abinitgui/master