Merge branch 'master' of https://github.com/manavortex/InventoryInsight

Author git <e.baumgarten@kehr.de>
Author date 2018-01-20 20:15:06
Author local date 2018-01-20 21:15:06 +0100
Committer git <e.baumgarten@kehr.de>
Committer date 2018-01-20 20:15:06
Committer local date 2018-01-20 21:15:06 +0100
Commit f21ea0ccaf65240386b00bde1680691e0df33545
Tree ab2f5bfe9b5f734e7c02360d520cd2947e06df35
Parent c4628d0f88db236dfb2d7cdf95a6e546e5d37e2f
Parent d1a8b2bd17645e33f739ba2d17df540c98ca1161
Merge branch 'master' of https://github.com/manavortex/InventoryInsight