Updated activity recognition, added Summary screen
Merge branch 'updatedActRecog'