Prepare for merge
Merge branch 'master' of https://github.com/joshuaar/Protomapper-Search

Conflicts:
	src/main/scala/Updater.scala