Adding Amazon search.
Merge branch 'amazonSearch'

Conflicts:
	web/js/common.js
Merge branch 'master' of github.com:DannyMardini/wishlist