Fixed remote resources
Merge branch 'development'