Last changes on the sockets
Redesign of Timeline
Seperation of timeline and socket into seperat files
[fix] Tags
[fix] Timeline layout and updating behavior
Merge branch 'develop' of https://github.com/Schosser/MasterLabProject09_2013 into develop
Solved issues #17, #19, #20 and implemented content of notes

#17 Keep playing video when adding note
#19 Jump button
#20 Personal/public notes
Merge branch 'develop' of https://github.com/Schosser/MasterLabProject09_2013 into develop
Merge branch 'klym' into develop

Conflicts:
	website/app/controllers/NoteController.java
	website/app/views/Application/add_video.html
	website/app/views/VideoController/addVideo.html
	website/app/views/VideoController/video.html
	website/public/css/style.css
timeline's note adding form integrated with websocket
Merge branch 'develop' of https://github.com/Schosser/MasterLabProject09_2013 into develop
add note doesn't work
prod settings
adding note fix
restriction of anonymous adding of notes
changed clientID for google auth
tracker added
tracker added
youtube url fix, auth id for application conf added
fix application.conf
production settings for db