Stage 1 complete.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/unl/edu/cse/app/Search.java