Add lot of awesome features
Merge branch 'feature/tweets' into develop