ticket: 6 jquery added to template
ticket: 6 Makefile modified
ticket: 6 merged to master