First commit
gitignore add
Merge branch 'develop' of github.com:anastasiacrs/StartApp into develop

Conflicts:
	MFLApp/src/main/webapp/WEB-INF/config/MFLApp-servlet.xml