Changed AmazonFlexPay call to fix method_not_found
Merge pull request #32 from brendte/master

AmazonFlexPay usage broke, so I fixed it
[security fix] rails 3.2.12
Merge pull request #36 from steakknife/develop

[security fix] rails 3.2.12
[security] rails 3.2.12 -> 3.2.13
[security] require json ~> 1.7.7
[security - heroku] ruby 1.9.2 -> 1.9.3
[security] optionally specify a new secret token using RAILS_SECRET_TOKEN
add one line of detailed comment for video file embed
Merged in develop (pull request #1)

[security fix] rails 3.2.12
updated Gemfile.lock
Merge branch 'master' of https://bitbucket.org/topleopard/selfstarter into develop
Gemfile.lock updated
[security] multi_xml, rack mandatory updates
Merge pull request #39 from kstrand/edit_setting_yml_documentation

add one line of detailed comment for video file embed
Merge pull request #37 from steakknife/develop

[security] rails 3.2.12 -> 3.2.13
Updated amazon_flex_pay, fixing #44
Merge pull request #45 from alanjcfs/master

Fix for #44