Merge branch 'develop'
Fixes #174
Removed jquery from global template.
Removed copy of jquery.
Fixed jQuery call.
Merge branch 'develop'
Reverted version back to 0.0.0.
Resolved merge conflicts.
Merge branch 'develop'
Merge branch 'develop'
Resolved merge conflicts.
Merge branch 'master' into develop