Changed Agriculture to Technology in step 2
Changed Agriculture to Technology in step 2 and merged to payoptions
...
Added terms and conditions
Merged master to implement november changes