added a few attributes
added presentation layer hierarchies and init block
Merge branch 'project2'
added % Discount
added % Discount
Admin Tool compare
Merge branch 'project2'
changed % Discount calc
changed % Discount calc
Admin Tool compare
Merge branch 'project2'