Added recovery mechanism to TwitterStream
Merge branch 'twitter-stream'
Merge branch 'master' of github.com:HugoSPT/flask

# By Hugo Sousa
# Via Hugo Sousa
* 'master' of github.com:HugoSPT/flask:
  master: Broker consumer
  master: Broker consumer
Merge branch 'master' of github.com:HugoSPT/flask into DB
Changed DB stuff