commit
Merge branch 'master' of https://github.com/Serega8/smart_copy

Conflicts:
	application/views/client/template.php
	file.png
	nbproject/private/private.xml
dla veroniki
veronika2