Загрузка проекта
Commit-2
Merge branch 'master' of github.com:bsa999/SpringTest1

Conflicts:
	src/main/java/com/sbt/ae/monitor/Monitor.java
	src/main/java/com/sbt/ae/monitor/TaskHandlerService.java
	src/main/java/com/sbt/uu/FileLoader.java
	src/main/java/foo/bar/HelloApp.java
	src/main/resources/spring-config.xml
	target/classes/spring-config.xml