initial data and logout/login
correction
fixing database
Merge remote-tracking branch 'origin/develop' into feature/video-timeline-integration

Conflicts:
	website/app/models/Note.java
	website/conf/application.conf
copy main.css to stylesheets folder