Artur commits 2'
Merge branch 'master' of github.com:tpluscode/nosql_hackathon

Conflicts:
	src/DTServer/Modules/FeedsModule.cs
	src/DTServer/Views/Feeds/feeds.cshtml