Merge pull request #44 from khempenius/master

Added expandable message windows
Changed hardcoded username to a user object
Merge pull request #51 from thompsona/userObj

Changed hardcoded username to a user object
Timeline controls scaling correctly
Merge pull request #53 from thompsona/edits

Timeline controls scaling correctly
Merge branch 'master' of https://github.com/mcb80x/minimal-player

Conflicts:
	frontend/js/player_main.coffee
Merge pull request #52 from khempenius/master

Added input field labels and icons
Comment created time visible on timeline
Merge pull request #54 from thompsona/timelineView

Comment created times visible on timeline
Duplicates changes from "Timeline controls scaling correctly"
Duplicates commit: 9436669f90b816399c60ec808053db55826358a6
Duplicates previous commits (so they work on Katie's computer)
Console-logs comment on hover, seeking on canvas
Changed timeline comment view color, position, added comment text tooltips on hover
Qtip comments, only draws when new comment is received
Tooltip comments with images
Merge pull request #55 from thompsona/timelineCommentHover

Timeline comment hover
Merge branch 'master' into commentRibbons

Conflicts:
	frontend/js/player_main.coffee
	static/css/mcb80x.css
	static/js/player_main.js