Merge pull request #2 from leotilli/dev

Add Activity templates to IntelliJ