add new jqgrid library
merge change
Merge branch 'master' of https://github.com/Themis-J/Themis

Conflicts:
	site/src/main/webapp/app/partials/head/nav.html