Merge pull request #1 from SunshineLibrary/master

update the code
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/outsideLoop'
[yanan] Yanan Proxy: hack userdata backend bug
Merge branch 'master' of github.com:SunshineLibrary/mothership
[yanan] add files and refactor file structure
[yanan] Dashboard - change the alert dialog to modal dialog when teacher's userinfo doesn't contain room info
[yanan] dashboard - build for last commit
fixed the bug about play video
delete .idea
fixed the correctcount number not right bug and fixed the bug about remove video element
Merge pull request #10 from YshadowZ/master

fixed the video and count bug
[yanan] temp hide button
Redirect some methods of console to winston.
They are log, info, error, warn.
You can just require /app/services/winston ONCE on the TOP of node app entries.
Replace "Application" to "application".
[yanan] merge register.sh file
[yanan] tmp merge
[yanan] tmp merge
Merge branch 'liguangsong-master'
Merge pull request #1 from gynsolomon/master

update code