fixed loading performance issue
Merge branch 'master' of https://github.com/andersont/CSC394

Conflicts:
	Capstone/target/m2e-wtp/web-resources/META-INF/maven/com.capstone/capstone/pom.properties