conflicted test 2
Merge branch 'master' of https://github.com/menboy/ATD_Login

Conflicts:
	war/control-panel/index.jsp