random fixes
Merge branch 'master' of https://github.com/BBackerry/SOEN387

Conflicts:
	src/controller/EditAccount.java
	src/controller/SearchResults.java

random merges