grim/resticide

merging
develop
2015-11-09, Gary Kramlich
6bdbec3f6a40
merging
[branchname]
master = default
develop = develop
feature = feature/
release = release/
hotfix = hotfix/
support = support/