updated the controller, and created login pages (as placeholders
Merge branch 'test'

Conflicts:
	SpringProjectTest/src/main/java/com/springprojecttest/app/controller/SampleController.java
moved the LoginController.java class to the controller package
updated springapp-servlet.xml
Made further changes
Merge branch 'test'
package renaming and updated springapp-servlet.xml
Merge branch 'test'
created db flatfiles and file controllers
Updating the FileController and test file
Updated controller with write functionality
Updated the file controller for writing to the file
Add the UserFileController class
updated code
Extra tests and added the property manager
test
Merge branch 'test'
update