added project as a whole to git
Merge branch 'release-1.1' into pluginsystem