Update README.rdoc
Update README.rdoc
Update README.rdoc

added link for setting up postgres article in wiki
HOTFIX - fix transport time display
Merge branch 'master' into develop
Merge branch 'develop' into feature-cart

Conflicts:
	app/views/articles/show/_article_contents.html.haml