Added ImportAssets view and Controller
partial fix to poorly formatted xml output
Merge remote-tracking branch 'upstream/master'
saving is now done in Model.java, can be overridden with inheritance - this allows all models save functionality out of the box
Merge pull request #26 from ryantk/master

partial fix to poorly formatted xml output
Resolved merge conflicts
Merge branch 'master' of https://github.com/Craig1987/MPPMS_Assignment
ProjectHierachy populates with project structure
Resolved more merge conflicts
Fixed compilation error