Fix album JSON serialization, track init
Use ?q= on front/back end for search term
Merge branch 'master' into db

Conflicts:
	potsfyi.py