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

Author git <vivec@telvanni.eu>
Author date 2018-02-18 15:25:21
Author local date 2018-02-18 16:25:21 +0100
Committer git <vivec@telvanni.eu>
Committer date 2018-02-18 15:25:21
Committer local date 2018-02-18 16:25:21 +0100
Commit feb1e68502e1c9b95129a5fabaafc09fef766285
Tree a644faf9bc7cc94e0917b4b4f0b4180ac764104e
Parent d27eb0df4e274e22dcd470db5522ea58c7b3f202
Parent 36e9941973c9f4212115a01ca2978c3559ec8904
Merge branch 'master' of https://github.com/manavortex/InventoryInsight