All test pass
Merge branch 'qa' of https://github.com/theprogram/floppy-disc into qa

* 'qa' of https://github.com/theprogram/floppy-disc:
  changed dashboard to home page

Conflicts:
	features/login.feature
	features/step_definitions/login.steps.rb