layout fix
styles fix
album beta
Merge branch 'master' of https://github.com/davidich/elixir

Conflicts:
	APPLICATION/Html/albums.html
	APPLICATION/Html/player.html
	APPLICATION/Html/tracks.html