John branch

Adding activity_main into master