Merge branch 'master' of https://github.com/davidich/elixir

Conflicts:
	APPLICATION/Html/filter.html
	APPLICATION/Html/track.html
	APPLICATION/Scripts/Vms/Search/oldMusic.js
	APPLICATION/elixir.html

fixes

Merge branch 'master' of https://github.com/davidich/elixir

Conflicts:
	APPLICATION/Html/welcome.html

dialog beta
Merge branch 'master' of https://github.com/davidich/elixir

Conflicts:
	APPLICATION/Html/welcome.html
	APPLICATION/Scripts/Vms/welcome.js
	APPLICATION/elixir.html