Album search is done
Merge branch 'master' of https://github.com/davidich/elixir

Conflicts:
	APPLICATION/Html/albums.html