code 18may
Merge branch 'toMerge' into jorge18may

Conflicts:
	ATMMonitoring/src/main/java/com/ncr/ATMMonitoring/controller/LoginController.java
	ATMMonitoring/src/main/resources/config.properties