redis
Merge https://github.com/haluo/j2ee

Conflicts:
	hbase/hbase.iml
	j2ee.iml
	j2ee.ipr
	j2ee.iws
	javaweb/javaweb.iml
	mongo/mongo.iml
	redis/redis.iml
redis