commit
cmomozirikj,zldf
Merge branch 'master' of https://github.com/availlant/7AC

Conflicts:
	WebContent/index.jsp

Signed-off-by: levalidator <levalidator@gmail.com>