Added plugin loader and Watipi plugin
Fixed merge conflict in .gitignore