temp commit to pull changes
Merge branch 'master' of https://github.com/davidich/elixir
genreSelector is done
Merge branch 'master' of https://github.com/davidich/elixir

Conflicts:
	APPLICATION/elixir.html
search loader style is fixed