Gitignore phpstorm
Added Modman Support
renamed modman file
Fixed modman
tweak to modman
Fixed wrong path
Merge branch 'master1'