Merge remote-tracking branch 'origin/125'
Merge remote-tracking branch 'origin/126'
Merge remote-tracking branch 'origin/181'
Task #203: Fixed margin for upcoming_events block
Merge remote-tracking branch 'origin/203' into test