aa
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	target/Autotr-jar-with-dependencies.jar
	target/Autotr.jar
	target/classes/hibernate.cfg.xml
	target/classes/log4j.properties
	target/classes/quartz.properties
	target/maven-archiver/pom.properties
	target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
	target/surefire-reports/TEST-com.taps.apartments.AppTest.xml
	target/surefire-reports/com.taps.apartments.AppTest.txt