Merge of pull request #2 with updated Angular Services / App structure branch

Big merge from previous integration of the baseline code with the styling/styleguide update, with the udpates for the baseline Angular services and general refactoring of the structure of the app