changed default template and updated sample data generator
Merge branch 'development' into 0.1-release