Changed from GL11 to the new GlStateManager
Small refomatting
Some work on the lockable doors.
Update to remote and fix conflicts

Conflicts:
	src/main/java/net/mcft/copy/betterstorage/item/locking/ItemKeyring.java