Merge pull request #26 from quandtm/master

Added base activity view/editor