CRM-11302 - some syntax fixes and put buttons in standard order on the new forms.

----------------------------------------
* CRM-11302:
  https://issues.civicrm.org/jira/browse/CRM-11302
Merge pull request #3130 from davecivicrm/CRM-11302

CRM-11302 - some syntax fixes and put buttons in standard order on the n...