layouts + questionsactivity + usercodeactivity
Merge remote-tracking branch 'origin/working_activities' into merge1