Made som small changes TO GUI

Now you can switch between the different search forms (they don't work atm)
Merge origin/master

Conflicts:
	src/domain/Controller.java