deleted small space in application js
moved jQ from application js to pages js
fixed merge conflicts