So much work done!
Merge branch 'master' of https://github.com/TechTrinkets/techtrinkets

Conflicts:
	src/java/model/SearchRequest.java
	src/java/model/db/DBHandler.java