Merge pull request #15 from AgileVentures/develop

User management and projects
Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne
Create a basic steps for documents
Create model Documents
merged with upstream
Ping: ActionController::RoutingError: uninitialized constant DocumentsController
moved button 'show' out of the user is logged in context
merged with documents branch
Update step definition of project's scenario
Scaffold Documents
ping: Documents index is showing right documents for project
Ping: Scenario: Create a new document
Merge remote-tracking branch 'thomas/documents' into documents

Conflicts:
	features/step_definitions/basic_steps.rb
pong: cucumber, new doc passing, edit docs skeleton
implemented edit document scenario
fixed problem with test db
refactored step definitions for projects
Merge branch 'documents' of https://github.com/yggie/WebsiteOne into documents
982890-63787200 Show page
wrote CRUD scenarios for documents, all passing
Merge branch 'documents' of https://github.com/yggie/WebsiteOne into documents