Added creatorId and absoluteId implementation to Category Class and fixed merge conflicts
Includes:
New constructor for use in system (others are for testing)
creatorId gets session user name from configuration class at constructor call
absloluteId sets to current user system's date and time at time of constructor call
merge conflicts were only one that exsisted in comment blocks, with only slight differences between options
Merged in pervious commitment changes. (creatorId and absoluteId of Category class)
//Merge branch 'dev' of https://github.com/tomorrow-nf/wpi-suite-team5 into dev
further merges
//Merge branch 'dev' of https://github.com/tomorrow-nf/wpi-suite-team5 into dev