Added basic user options
Adding edf file upload
Added basic integration with Cassandra
corrected minor bugs
Merge branch 'testing'