Merge branch 'master' of github.com:dedoki/PornoLabAssistant

Conflicts:
	README.md
Merge branch '1.0.0' of github.com:dedoki/PornoLabAssistant into 1.0.0