:) Sorted out all merge conflicts app compiles on Ubuntu

Master is now in a stable state again after merging in student changes
from week 17 - 23 Feb
Added jQry base url

Seems that jq related plugins did not work without providing a base url