introduced timeline activity and view
actually added timeline files
fixed conflicts