Merge branch 'master' into development
adds integration with native address book
adjusts folders
Merge branch 'development'