Merge pull request #535 from bjhargrave/master

Document proposed new triangular workflow and developer certificate of origin
gradle: Update gradlew to gradle 2.0

Signed-off-by: BJ Hargrave <bj@bjhargrave.com>
Merge pull request #539 from bjhargrave/gradle20

gradle: Update gradlew to gradle 2.0
[macro] Added a number of macros and their tests
[doc] Cleaned up some constants, deprecated ones that were not used
[merge properties] Now can define the separator for merging properties.
[boolean] Handling of booleans was inconsistent
[model] Deprecated methods that used unused variables
[doc] Minor text change
removed unused code.
[test path] Huh? The path of some test cases was set to some weird URI

Somebody thought it better to get somehow the root URI and turn it in to a File. Did not work reliably, so changed back to the good old addClasspath( new File(“bin”))
[enroute] The enroute templates
Merge pull request #540 from pkriens/master

Several updates
test: Set cwd to Project.getBase() as the default for ProjectTester

Signed-off-by: BJ Hargrave <bj@bjhargrave.com>
Merge pull request #543 from bjhargrave/testcwd

testing: Set cwd to Project.getBase() as the default for ProjectTester
[identity] Can now read and write encrypted settings files

bnd settings -l test.json -s secret -g email=X@apple.com

See bnd help settings
[doc] Minor updates for doc purposes
[enroute] New enroute template
[enroute] new templates
[export] Exports a bndrun file to its deployable format