some specs
integration spec
feature spec
merge master into specs_4_controllers
fix fabricator
fix specs
add timecop
more timecops
Merge pull request #8 from opahk/specs_4_controllers

Specs 4 controllers
Merge branch 'master' into users

Conflicts:
	spec/dummy/db/schema.rb