Merge branch 'master' of github.com:pepakriz/test

Conflicts:
	test