fix application.js
commit
commit2
Merge remote-tracking branch 'origin/master'
testing
from github
from github2
before github merge
c1
Fix for layout