merge
Merge branch 'master' of github.com:dopl/bytecast-common

Conflicts:
	bytecast-common/src/edu/syr/bytecast/amd64/api/constants/RegisterType.java