Store jquery-2.1 locally for dev. Had a weird issue where it wouldn't be found.
Merge branch 'master' into gareth/FileTreeBranch
Fix broken bootstrap fonts (stops icons working)
Fix missing google collect import (don't know how this happened?
Merge branch 'master' of https://github.com/camsnz/mast

Conflicts:
	src/main/java/com/example/helloworld/resources/HelloWorldResource.java
Update search to point to new end point.
Fix controllers.