Insertion Complete
Merge branch 'master' of https://github.com/shashwat001/redis-admin

Conflicts:
	src/main/java/org/redisadmin/model/RedisAccessModel.java
	src/main/java/org/redisadmin/view/ListKeysServlet.java
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/js/server.js
	src/main/webapp/serverOperations.jsp