updating velocity templates
adding two years crop flag
package modification
package modification
cleaning
xml format