Commit macbook changes
Merge branch 'master' of https://github.com/LeeBaker3/Diss-Src

Conflicts:
	AtomicInfromationConfigManager2/nbproject/private/private.xml