Let jq and jquery live together in harmony.
Some files expect $ to be jq, but if jquery is loaded before jq the $ is taken by jquery, causing all kinds of errors. This commit fixes this.
Merge pull request #193 from S2-/f19b46df9e09185ab913520b648e6e07b3210e8a

Prevent conflicting use of $ with jQuery