Develop

Merge to master branch in order to let people only work with light version of AGDISTIS.