refactoring auth controller spec
added specs for youtube
small updates to auth controller, taking merge from yaro
Merge remote-tracking branch 'yaro/auth-controller-refactoring' into auth-controller-refactoring
all tests GREEN, ready for refactoring
refactoring auth_controller. Phase 1
auth branch
cukes green, refactor if/else into three different methods. have one rpec failing and need to write two tests
sorting by created_at column ASC in sub-documents folder
Merge branch 'staging' of https://github.com/sampritipanda/WebsiteOne into staging
Written cucumber tests for tabs links
Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into develop
Tabbed Links Functionality Completed
Extracted js to projects.js file
Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into tabs

Conflicts:
	db/schema.rb
Merge pull request #214 from coddeys/tabs

Great job!
quick fix for '..time ago..' in document metadata on documents show page.
Merge pull request #215 from tochman/develop

Version Control - Fix for Documents metadata
Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into develop
Merge pull request #216 from AgileVentures/develop

Pushing to Staging