Tag generator
many great changes
Merge branch 'source' into build
Build Sat Mar  2 20:01:50 PST 2013