added values to the activityx
Merge branch 'master' of heroku.com:softlife
Update the inArguments to use ampScript.
Merge branch 'master' of github.com:gdborton/softlife-radian6
Merge branch 'master' of heroku.work:softlife