Merge branch 'hotfix/edit_banner' into develop

* hotfix/edit_banner:
  banner edited
Merge branch 'hotfix/edit_banner_to_mini' into develop

* hotfix/edit_banner_to_mini:
  banner edited
  add mailer and remove dollar to ok
Merge branch 'hotfix/remove_banner_after_conference' into develop

* hotfix/remove_banner_after_conference:
  after conference
fix resque mailer worker start with capistrano
grouping validators
add put buy test
add timepad_data_helper restore_data_from_csv_test
add tests for timepad_test_data_helper
add tests for timepad_test_data_helper
Merge branch 'feature/refactoring' of github.com:ulmic/nastachku into feature/refactoring

* 'feature/refactoring' of github.com:ulmic/nastachku:
  add tests for timepad_test_data_helper
Merge branch 'feature/refactoring' of github.com:ulmic/nastachku into feature/refactoring

* 'feature/refactoring' of github.com:ulmic/nastachku:
  add tests for timepad_test_data_helper
Merge branch 'feature/refactoring' of github.com:ulmic/nastachku into feature/refactoring

* 'feature/refactoring' of github.com:ulmic/nastachku:
add .tconsole to detect decorators test
add lectures sorted by time test
add tests for at_this_time
add test for slot at the time
add test for hall decorator
remove resque start to mailer start
fix test
fix test