Gitignore phpstorm noise
Added Modman support, fixed module path
Merge branch 'master1'