Commit to old branch before merging
Merge remote-tracking branch 'origin/trunk'
Interim Commit
Field validations completed
All field validations done. 
Calculations seem screwed up somehow.
Merge branch 'master' into v1.1