Changed file jquery-handlers
Merge branch 'master' of https://github.com/alexbokii/bookeebo

Conflicts:
	views/main.ejs