twitter api update
minus deleted files
twitter fixed, not tested
minor fixes Twitter and some other files
merging
merging with dev again
merging with dev again