no timepad
fix merge conflict
Merge branch 'hotfix/platidoma_remove' into develop

* hotfix/platidoma_remove:
  platidoma removed
  add program
Merge branch 'hotfix/fix_tests' into develop

* hotfix/fix_tests:
  tests passed
check travis
Merge remote-tracking branch 'origin/feature/pay_without_timepad' into feature/pay_without_timepad

* origin/feature/pay_without_timepad:
  no timepad

Conflicts:
	app/views/web/accounts/_form.html.haml
realize logic of orders
add order_pay_type
new logic of orders
Merge branch 'release/some_tests_fixed'

* release/some_tests_fixed:
  check travis
Merge branch 'feature/pay_without_timepad' of github.com:ulmic/nastachku

* 'feature/pay_without_timepad' of github.com:ulmic/nastachku:
  new logic of orders
  add order_pay_type
  realize logic of orders
  no timepad
Merge branch 'feature/pay_without_timepad' into develop

* feature/pay_without_timepad:
  new logic of orders
  add order_pay_type
  realize logic of orders
  no timepad
platidoma removed
Merge branch 'hotfix/platidoma_phantom'

* hotfix/platidoma_phantom:
  platidoma removed
Merge branch 'hotfix/platidoma_phantom' into develop

* hotfix/platidoma_phantom:
  platidoma removed
Merge branch 'release/pay_without_timepad'

* release/pay_without_timepad: