Merge branch 'master' into ui-template
Resolving sprockets issues
Merge branch 'ui-template'