added activity tables
Working on displaying activity
Progressing on feed
Formatting coming along
Owner_id is now set; Also ran annotate
Usernames in Views finally works!!
activity feed for basic crud operations is now functioning correctly
Merge branch 'develop' into activity_feed

Conflicts:
	app/models/user.rb