Fixed theme url reference problem
Merge branch 'development'