Start to add JRS PhD work to codebase

Signed-off-by: rsnape <rsnape@dmu.ac.uk>
Remove restriction on Key value generic

Signed-off-by: rsnape <rsnape@dmu.ac.uk>
Start different implementation of psych models

Signed-off-by: rsnape <rsnape@dmu.ac.uk>
Tidying up household prosumers

Signed-off-by: rsnape <rsnape@dmu.ac.uk>
Update adoption scenario

Signed-off-by: rsnape <rsnape@dmu.ac.uk>
Tidy up gui detection and initialisation

Signed-off-by: rsnape <rsnape@dmu.ac.uk>
New launch configurations

Signed-off-by: rsnape <rsnape@dmu.ac.uk>
Remove duplicate and redundant code

Signed-off-by: rsnape <rsnape@dmu.ac.uk>
Update gitignore to ignore graphics cruft

Signed-off-by: rsnape <rsnape@dmu.ac.uk>
remove redundant Thumbs.db

Signed-off-by: rsnape <rsnape@dmu.ac.uk>
Merge branch 'master' of https://github.com/rsnape/CASCADE.git

Conflicts resolved manually by JRS in following files:
	.gitignore
	src/uk/ac/dmu/iesd/cascade/context/AdoptionContext.java
	src/uk/ac/dmu/iesd/cascade/context/AdoptionContextBuilder.java
	src/uk/ac/dmu/iesd/cascade/util/TimeSeries.java

Used remote version of this conflicting file:
	src/uk/ac/dmu/iesd/cascade/behaviour/psychological/cognitive/SCTModel.java

Signed-off-by: rsnape <rsnape@dmu.ac.uk>