Merge branch 'master' of git@github.com:litiebiao2012/redis-monitor.git

Conflicts:
	src/main/java/com/redis/monitor/manager/RedisManager.java
Merge branch 'master' of git@github.com:litiebiao2012/redis-monitor.git