add the encrypt
Merge remote-tracking branch 'origin/master'
1. add the test for multi calculate
Merge branch 'master' of github.com:zhwbqd/Java

Conflicts:
	RESTEasyEtagDemo/pom.xml
add fibonacci
Merge branch 'master' of github.com:zhwbqd/Java
classloader
classloader
Merge remote-tracking branch 'origin/master'
semaphore test
add the mc
Merge branch 'master' of github.com:zhwbqd/Java
add java format
add format
add drools
Merge branch 'master' of github.com:zhwbqd/Java
guava init
fix pom
Merge remote-tracking branch 'origin/master'
add netty