Old version
Merge branch 'develop' of github.com:anastasiacrs/StartApp into develop

Conflicts:
	.gitignore
Merge branch 'develop' of github.com:anastasiacrs/StartApp into develop
no changes2
Revert "no changes2"

This reverts commit acf18e60740f92985cb9b1204789ce92332e30fe.
Merge branch 'develop' of github.com:anastasiacrs/StartApp into develop

Conflicts:
	MFLApp/pom.xml
db_scripts: renamed tables and fields
pom saving
Merge branch 'develop' of github.com:anastasiacrs/StartApp into develop