Merge branches 'master' and 'test-dunglas-migration' of github.com:partkeepr/PartKeepr - partkeepr

commit af33c36aad34933f25c0e56ada7278b055e99b73
parent 56a3ee3fad9a6968fa7ecff06746b9ebe6447c52
Author: felicia <felicia@funkytown.mannheim.partkeepr.com>
Date:   Tue, 30 May 2017 16:43:08 +0200

Merge branches 'master' and 'test-dunglas-migration' of github.com:partkeepr/PartKeepr

	partkeepr fork of partkeepr
	git clone https://git.e1e0.net/partkeepr.git
	Log \| Files \| Refs \| Submodules \| README \| LICENSE