deleted:    ../struts2-jquery-tree-plugin-3.3.1.jar
	modified:   src/main/java/com/issoft/ftp/client/FtpClientService.java
	modified:   src/main/java/com/issoft/ftp/presentation/action/FtpAction.java
	modified:   src/main/resources/struts.xml
	modified:   src/main/webapp/WEB-INF/spring-database.xml
	modified:   src/main/webapp/WEB-INF/spring-security.xml
	modified:   src/main/webapp/WEB-INF/web.xml
	modified:   src/main/webapp/jsp/download.jsp
Merge branch 'master' of https://github.com/Vbonik/test-repository

Conflicts:
	testProject/src/main/resources/struts.xml
	testProject/src/main/webapp/WEB-INF/spring-database.xml
	testProject/src/main/webapp/jsp/download.jsp

	modified:   pom.xml
	modified:   src/main/java/com/issoft/ftp/presentation/action/FtpAction.java
	new file:   src/main/java/com/issoft/ftp/util/LoggingAspect.java
	modified:   src/main/resources/struts.xml
	modified:   src/main/webapp/WEB-INF/applicationContext.xml
	modified:   src/main/webapp/WEB-INF/spring-database.xml
	modified:   src/main/webapp/WEB-INF/spring-hibernate.xml
	modified:   src/main/webapp/WEB-INF/web.xml
	new file:   src/main/webapp/css/chosen.css
	new file:   src/main/webapp/css/fonts/base/icomoon-webfont.eot
	new file:   src/main/webapp/css/fonts/base/icomoon-webfont.svg
	new file:   src/main/webapp/css/fonts/base/icomoon-webfont.ttf
	new file:   src/main/webapp/css/fonts/base/icomoon-webfont.woff
	new file:   src/main/webapp/css/fonts/social/icomoonsocial-webfont.eot
	new file:   src/main/webapp/css/fonts/social/icomoonsocial-webfont.svg
	new file:   src/main/webapp/css/fonts/social/icomoonsocial-webfont.ttf
	new file:   src/main/webapp/css/fonts/social/icomoonsocial-webfont.woff
	new file:   src/main/webapp/css/img/breadcrumbs-bg.gif
	new file:   src/main/webapp/css/img/chosen-sprite.png
	new file:   src/main/webapp/css/img/fancybox/blank.gif
	new file:   src/main/webapp/css/img/fancybox/fancy_close.png
	new file:   src/main/webapp/css/img/fancybox/fancy_loading.png
	new file:   src/main/webapp/css/img/fancybox/fancy_nav_left.png
	new file:   src/main/webapp/css/img/fancybox/fancy_nav_right.png
	new file:   src/main/webapp/css/img/fancybox/fancy_shadow_e.png
	new file:   src/main/webapp/css/img/fancybox/fancy_shadow_n.png
	new file:   src/main/webapp/css/img/fancybox/fancy_shadow_ne.png
	new file:   src/main/webapp/css/img/fancybox/fancy_shadow_nw.png
	new file:   src/main/webapp/css/img/fancybox/fancy_shadow_s.png
	new file:   src/main/webapp/css/img/fancybox/fancy_shadow_se.png
	new file:   src/main/webapp/css/img/fancybox/fancy_shadow_sw.png
	new file:   src/main/webapp/css/img/fancybox/fancy_shadow_w.png
	new file:   src/main/webapp/css/img/fancybox/fancy_title_left.png
	new file:   src/main/webapp/css/img/fancybox/fancy_title_main.png
	new file:   src/main/webapp/css/img/fancybox/fancy_title_over.png
	new file:   src/main/webapp/css/img/fancybox/fancy_title_right.png
	new file:   src/main/webapp/css/img/fancybox/fancybox-x.png
	new file:   src/main/webapp/css/img/fancybox/fancybox-y.png
	new file:   src/main/webapp/css/img/fancybox/fancybox.png
	new file:   src/main/webapp/css/img/fancybox/jquery.easing-1.3.pack.js
	new file:   src/main/webapp/css/img/fancybox/jquery.fancybox-1.3.4.js
	new file:   src/main/webapp/css/img/fancybox/jquery.fancybox-1.3.4.pack.js
	new file:   src/main/webapp/css/img/fancybox/jquery.mousewheel-3.0.4.pack.js
	new file:   src/main/webapp/css/img/grid.png
	new file:   src/main/webapp/css/img/icon-arrow-right.png
	new file:   src/main/webapp/css/img/icon-check.png
	new file:   src/main/webapp/css/img/rte/link.png
	new file:   src/main/webapp/css/img/rte/link_break.png
	new file:   src/main/webapp/css/img/rte/picture_empty.png
	new file:   src/main/webapp/css/img/rte/text_align_center.png
	new file:   src/main/webapp/css/img/rte/text_align_left.png
	new file:   src/main/webapp/css/img/rte/text_align_right.png
	new file:   src/main/webapp/css/img/rte/text_bold.png
	new file:   src/main/webapp/css/img/rte/text_italic.png
	new file:   src/main/webapp/css/img/rte/text_list_bullets.png
	new file:   src/main/webapp/css/img/rte/text_list_numbers.png
	new file:   src/main/webapp/css/img/rte/text_strikethrough.png
	new file:   src/main/webapp/css/img/rte/text_subscript.png
	new file:   src/main/webapp/css/img/rte/text_superscript.png
	new file:   src/main/webapp/css/jquery.fancybox-1.3.4.css
	new file:   src/main/webapp/css/kickstart-buttons.css
	new file:   src/main/webapp/css/kickstart-forms.css
	new file:   src/main/webapp/css/kickstart-grid.css
	new file:   src/main/webapp/css/kickstart-icons.css
	new file:   src/main/webapp/css/kickstart-menus.css
	new file:   src/main/webapp/css/kickstart.css
	new file:   src/main/webapp/css/prettify.css
	new file:   src/main/webapp/css/tiptip.css
	new file:   src/main/webapp/js/kickstart.js
	new file:   src/main/webapp/js/prettify.js
	new file:   src/main/webapp/jsp/admin.jsp
	modified:   src/main/webapp/jsp/directoryList.jsp
	modified:   src/main/webapp/jsp/download.jsp