merging part of dev branch
updating css before debugging js issue
moving working change back in
Merge branch 'dev'

fixing the parts of dev branch causing problems (missing js sourcing in application.html.erb)