Merge pull request #1 from a539899/development

Development
Merge pull request #2 from a539899/development

Development
Merge pull request #3 from a539899/development

Development 2
Delete test2.txt

not reqired
fixed
Merge branch 'bugfix' into dvelopment

Conflicts:
	test2.txt