Generated files addition
Added "if" support in calculator.
Minor changes.
Started using fragments within calculator.
For merging
Merge branch 'calc-extension-1'