Merge
Merge branch 'Merge'

Conflicts:
	AnubisClient/AnubisClient.v12.suo