Merge pull request #195 from firethanatos/master

Added programming tests and incorporated it into system
Split Activity into Code(Programming)Activities and Other Activities