Merge branch 'modul1' of https://github.com/Rovalx/wysama into test

Conflicts:
	.classpath
	.project
Merge branch 'modul1' of https://github.com/Rovalx/wysama into test

Conflicts:
	.classpath
	.project
message
Merge branch 'test' of https://github.com/Rovalx/wysama into test
Merge branch 'modul1' of https://github.com/Rovalx/wysama into test

Conflicts:
	.classpath
	.project