Merge branch 'JQuery' into Addition-of-JQuery-etc

Conflicts:
	src/libs/databaseCreationScript.sql

pharm search