cleaner unit test
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	src/main/java/com/ctriposs/bigcache/CacheConfig.java
	src/test/java/com/ctriposs/bigcache/BigCacheSimplePerfTest.java