Finished activities header
Merged generator-changes