Resolve issue with merging of css/build/vendor files
Merge branch 'development'