Merge branch 'development'
Removed local libraries module
Merge branch 'master' into development