Tweaking of algorithm, bugfix on frontend
User search now goes through server instead of directly to lastfm for security reasons
Removed lfmapikey
Merge branch 'master' into evaluation

Conflicts:
	WebSite/app/main.js
	WebSite/app/viewmodels/results.js