New facelift index.jsp, Added category edit
Commit after merging