Merge pull request #2 from manavortex/master

Author Baertram <pz1@gmx.net>
Author date 2018-06-27 13:53:52
Author local date 2018-06-27 15:53:52 +0200
Committer GitHub <noreply@github.com>
Committer date 2018-06-27 13:53:52
Committer local date 2018-06-27 15:53:52 +0200
Commit 0f00d4796aee06904cd25a27017b8cd0abf51fc6
Tree b33d968b8c5a88ef597e17a6cf1d14b7924bf889
Parent 90381417107083d7e3933152d23d152dbabc80e7
Parent 7711411edddff283827c55230a1032148a7c2c6a
Merge pull request #2 from manavortex/master

Updates from manavortex/master branch -> FCOIS integration