Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/ArtificialCraft/ArtificialSlums/Cosmos/Entities/ArtificialEntity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/ArtificialCraft/ArtificialSlums/Cosmos/Cosmos.java
	src/net/ArtificialCraft/ArtificialSlums/Cosmos/Entities/ArtificialEntity.java
	src/net/ArtificialCraft/ArtificialSlums/Cosmos/Entities/ArtificialEntity.java.orig
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/ArtificialCraft/ArtificialSlums/Cosmos/Entities/ArtificialEntity.java
Merge pull request #8 from ArtificialCraft/cmanBranch

Cman branch