test commit in terminate
Merge branch 'master' of https://github.com/gratendas/newsletters

Conflicts:
	.idea/workspace.xml
	web/index.php
	web/success.html
	web/uploads/20140415_it - template.html
Commit 22/5