-Fix twitta bug (that!=this)
Merge branch 'dev' of https://github.com/adambarreiro/watchFire.git into dev