Merged Kimmi's portal code
Merge branch 'master' of https://github.com/Charmillionaires/Brentwoodmon

Conflicts:
	nbproject/private/private.properties
	src/brentwoodmon/BrentwoodEnvironment.java