prototype
quick fix v1.1 for production
fixed merge problems
added master-specific stuff
Merge branch 'master' into r2_contacts
release notes added, feature finished