changes from 00

Conflicts:
	src/descr.txt
changes 15-00

Conflicts:
	src/descr.txt
internal commit 15-04

Conflicts:
	src/descr.txt
added 00.txt