D-18

v-4.0
---
1. add to the table "cm7"

    ==> done
Merge branch 'D-18_import-files'

Conflicts:
	gen/cm7/main/R.java
	res/values/strings.xml
	src/app/main/ImpActv.java
	src/app/main/MainActv.java
	src/app/utils/Methods_dlg.java
m

1. Merged with D-18
	=> errors
m

post-merge processes
m

post-merge processes
m

post-merge processes
m

post-merge processes

		=> done