Add node_modules, bower_components and generated resources files
Merge remote-tracking branch 'origin/master'
Update styles