Reorganized the Firebase database
Merge remote-tracking branch 'origin/master'
Fixed NSNumber to double error