Merge branch 'master' into svn

git-svn-id: https://svn2.sliksvn.com/sarathmada_scribussvn@6 a25273ce-ce32-e411-b281-0050560100c8
Conflicting line added in svn first



git-svn-id: https://svn2.sliksvn.com/sarathmada_scribussvn@7 a25273ce-ce32-e411-b281-0050560100c8
Merge branch 'svn'

Conflicts:
	Readme.md