Merge branch 'next' of github.com:zneak/capstone into next

Conflicts were resolved by accepting every change from aquynh's repository.

Conflicts:
	bindings/java/capstone/Arm64_const.java
	bindings/java/capstone/Arm_const.java
	bindings/java/capstone/Mips_const.java
	bindings/java/capstone/Ppc_const.java
	bindings/java/capstone/Sparc_const.java
	bindings/java/capstone/Sysz_const.java
	bindings/java/capstone/X86_const.java
	bindings/java/capstone/Xcore_const.java
	bindings/ocaml/arm64_const.ml
	bindings/ocaml/arm_const.ml
	bindings/ocaml/mips_const.ml
	bindings/ocaml/ppc_const.ml
	bindings/ocaml/sparc_const.ml
	bindings/ocaml/sysz_const.ml
	bindings/ocaml/x86_const.ml
	bindings/ocaml/xcore_const.ml
	bindings/python/capstone/arm64_const.py
	bindings/python/capstone/arm_const.py
	bindings/python/capstone/mips_const.py
	bindings/python/capstone/ppc_const.py
	bindings/python/capstone/sparc_const.py
	bindings/python/capstone/sysz_const.py
	bindings/python/capstone/x86_const.py
	bindings/python/capstone/xcore_const.py
	include/capstone/arm.h
	include/capstone/arm64.h
	include/capstone/mips.h
	include/capstone/ppc.h
	include/capstone/sparc.h
	include/capstone/systemz.h
	include/capstone/x86.h
	include/capstone/xcore.h
	xcode/Capstone.xcodeproj/project.pbxproj

.gitignore

@@ -81,7 +81,8 @@ ipch/
 *.user
 
 # Xcode
-xcode/Capstone.xcodeproj/xcuserdata
+xcode/Capstone.xcodeproj/xcuserdata/
+xcode/Capstone.xcodeproj/project.xcworkspace/
 
 # suite/
 test_arm_regression