gplugin/gplugin

merging
develop
2015-06-30, Gary Kramlich
66d0e91ffa49
merging
[branchname]
master = default
develop = develop
feature = feature/
release = release/
hotfix = hotfix/
support = support/