added tokens to database, they now generate on creation of a meeting
before alex embarked on changing everything to tokens
fix error with lightbox
finished transition to using tokens instead of ids
Merge branch 'master' of https://github.com/a17levine/blocktalk into hackathon

bringing in silas's changes to master
Merge branch 'hackathon' of https://github.com/a17levine/blocktalk into hackathon

bringing silases master branch and alex's changes to hackathon branch
tidied up some language
Took off 12mid
Merge branch 'hackathon' of https://github.com/a17levine/blocktalk into hackathon

We're merging!
fix lightbox button
merge
add validation for user1
merged hackathon branch with master