Changes to auto-complete
Merge branch 'master' into Issue0069

Conflicts:
	src/main/java/ca/mcgill/cs/creco/web/controller/SearchController.java