Revert "commit"

This reverts commit c2334cfa976f6940fd478d5525a2db28902bc9a6.
Revert "Revert "commit""

This reverts commit dae340196666bebc55ebb76aafd76b0ac785e8c0.
commit to master2
commit
commit master
Merge branch 'master2'

Conflicts:
	src/com/home/jvm/monitor/pages/IndexBean.java
delete