Setting paths by pressing P
Merge remote-tracking branch 'origin/master'

Conflicts:
	hymn/inputhandler.lua