gplugin/gplugin

merging
feature/osx-fixing
2015-12-19, Gary Kramlich
d03aa8e308ea
merging
[branchname]
master = default
develop = develop
feature = feature/
release = release/
hotfix = hotfix/
support = support/