Update hr.yml
Merge pull request #184 from win32re/patch-4

Update hr.yml
Admins can set minimum tip amount in the configuration file
add more tests

* merged latest project-management branch
* added more examples to spec/controllers/users_controller_spec.rb
* added more examples to spec/controllers/projects_controller_spec.rb
* added more scenarios to features/manage_project.feature
* added more scenarios to features/pretty_paths.feature
* added more scenarios to features/sign_up_sign_in.feature
add more tests

* merged latest project-management branch
* merged latest upstream master and resolved colicts
* added more examples to spec/controllers/users_controller_spec.rb
* added more examples to spec/controllers/projects_controller_spec.rb
* added more scenarios to features/manage_project.feature
* added more scenarios to features/pretty_paths.feature
* added more scenarios to features/sign_up_sign_in.feature
* reconciled features/min_tip_amount.feature with new test schema
* added a few more examples to features/min_tip_amount.feature
* moved the "min tip amount" step into features/step_definitions/tips_steps.rb
* delete test values added to CONFIG hash after every scenario

Conflicts:
	features/step_definitions/common.rb
	features/tip_modifier_interface.feature