Merge branch 'development' of github.com:isubit/luggage into development

Conflicts:
	.gitmodules