Merge origin/master

Conflicts:
	src/test/java/com/cemeterylistingswebtest/test/services/LoginServiceTest.java