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 branch 'no_jquery_conflict' of github.com:S2-/appframework into no_jquery_conflict