rewrew
rewre
Merge branch 'master' of https://github.com/antouk/rstext

Conflicts:
	script/confRS.prop