Merge pull request #1 from ccnmtl/master

merge upstream
Adding owner in views.py and test_view.py
flake8 fixes
Merge pull request #24 from zmustapha/dev-zarina

Adding owner in views.py and test_view.py
extending Add Action Item template to include owner.
add project feeds, per pid
merge w/ hackathon codeMerge branch 'master' of github.com:ccnmtl/dmt
Merge branch 'master' of https://github.com/ccnmtl/dmt into action-item-enhancement

Conflicts:
	media/css/main.css
Merge pull request #25 from sdreher/action-item-enhancement

extending Add Action Item template to include owner.
add test for project feed
Merge branch 'master' of github.com:ccnmtl/dmt
Merge pull request #27 from mrenoch/master

Add project recent activity rss feeds
return all project-s active items, instead of limitting it to N
Merge pull request #29 from mrenoch/master

return all project's active items, instead of limitting it to N
select owner based on PMTUser (User) username rather than DjangoUser
Merge pull request #30 from sdreher/action-item-enhancement

select owner based on PMTUser (User) username rather than DjangoUser
remove duplicates in CONTRIBUTORS
Merge pull request #31 from nikolas/fix-contributors

remove duplicates in CONTRIBUTORS