updating 1.5 label from dev to master
Fix #142
Merge pull request #218 from rlouapre/issue-142

Issue 142
Fix #164
Merge pull request #219 from rlouapre/issue-164

Fix #164
Accidentally commited to master when it should have gone to dev

Revert "Merge pull request #219 from rlouapre/issue-164"

This reverts commit 6d5b260d5516cad5c5796a54c854c4910d888750, reversing
changes made to a07477636dac44a939be36884f6c8697af084c2e.
#150 - fixing jar generation and the way that paths are resolved for files within the jar.
- app_specific.rb now works with the jar
Merge pull request #286 from paxtonhare/dev

#150 - fixing jar generation and the way that paths are resolved for fil...
Issue #37 and Issue #28
adding support for specifying groups for appservers and forests
Issue #38 - moving the order of the creation of groups ahead of forests.
Merge pull request #287 from paxtonhare/dev

Issue #37 and Issue #28
Issue #288 - requiring confirmation before wiping non-local environment.

Reworking server_config.rb unit tests into minitest specs. adding test for credentials command.
Merge pull request #290 from paxtonhare/dev

Issue #288 - requiring confirmation before wiping non-local environment.
Issue #291 Adding additional documentation

Adding documentation into app_specific.rb to make it easier for people to use and extend.
Merge pull request #292 from paxtonhare/dev

Issue #291 Adding additional documentation
Adding a CONTRIBUTING file

This file outlines how to contribute to Roxy
Merge pull request #293 from paxtonhare/add-contributing

Adding a CONTRIBUTING file
cleaning up CONTRIBUTING file

Incorporating feedback from Dave
Merge pull request #294 from paxtonhare/dev

cleaning up CONTRIBUTING file
Merge remote-tracking branch 'roxy/dev' into dev