temp check-in to pass broken Tracks layout for fixing
Merge branch 'master' of https://github.com/davidich/elixir

Conflicts:
	APPLICATION/Html/welcome.html
	APPLICATION/Scripts/app.js
	APPLICATION/elixir.html
new view structure is completed (tracks view is adjusted for new structure)