Testing NetBeans Git support 4
.gitignore test commit
vdsfgdfg dfg df dfg
test commit 2
Merge branch 'develop' of github.com:anastasiacrs/StartApp into develop

Conflicts:
	MFLApp/pom.xml
	MFLApp/src/main/java/com/epam/mfl/controller/AccountController.java
	MFLApp/src/main/java/com/epam/mfl/controller/HomeController.java
	MFLApp/src/main/java/com/epam/mfl/service/UserDetailsServiceImpl.java
	MFLApp/src/main/webapp/META-INF/context.xml
	MFLApp/src/main/webapp/WEB-INF/config/MFLApp-database.xml
	MFLApp/src/main/webapp/WEB-INF/config/MFLApp-security.xml
	MFLApp/src/main/webapp/WEB-INF/config/MFLApp-servlet.xml
	MFLApp/src/main/webapp/WEB-INF/views/home.jsp
	MFLApp/src/main/webapp/WEB-INF/views/login.jsp
	MFLApp/src/main/webapp/WEB-INF/views/tiles-definitions.xml
	MFLApp/src/main/webapp/WEB-INF/views/tiles/body.jsp
	MFLApp/src/main/webapp/WEB-INF/views/tiles/footer.jsp
	MFLApp/src/main/webapp/WEB-INF/views/tiles/header.jsp
	MFLApp/src/main/webapp/WEB-INF/views/tiles/master_template.jsp
	MFLApp/src/main/webapp/WEB-INF/views/tiles/vertical_navigation.jsp
	MFLApp/src/main/webapp/WEB-INF/web.xml
	db/db_scripts/full_data.sql
readme.txt deleted
asdas asd as asd
UserDetailsService property fixed
test