Added base functionality for user timeline
Merge origin/master