backbone libs
backbone stubs
Merge branch 'refs/heads/master' into backbone
Merge branch 'refs/heads/master' into backbone
Merge branch 'refs/heads/master' into backbone
Merge branch 'refs/heads/master' into backbone

Conflicts:
	views/layout.html
Merge branch 'refs/heads/master' into backbone
Merge branch 'refs/heads/master' into backbone
Merge branch 'refs/heads/master' into backbone
Merge branch 'refs/heads/master' into backbone
Merge branch 'refs/heads/master' into backbone
Merge branch 'refs/heads/master' into backbone
readme
Merge branch 'refs/heads/master' into backbone
Merge branch 'refs/heads/master' into backbone
Merge branch 'refs/heads/master' into backbone

Conflicts:
	views/layout.html
Merge branch 'refs/heads/master' into backbone
userview stubs
Merge branch 'refs/heads/master' into backbone
backbone w/ working playback/display