#50 updating bad references to 'caplin' inside Javascript libs
Please can you review, @andyberry88?
CC: @thecapdan, @dchambers
adding more info to exception when the index page cant be filtered
Adding additional test case for #694
Merge branch 'develop' of https://github.com/BladeRunnerJS/brjs into develop
Updating TemplateTests.java to address linux build failure
Merge pull request #736 from BladeRunnerJS/jsdoc-caplin-refs

#50 updating bad references to 'caplin' inside Javascript libs
add 'enabled' property to Option node
add JsDoc for the new argument
Merge pull request #739 from janhancic/develop-add-enabled-to-presenter-option

Add 'enabled' property to Option node in presenter
Attempting to fix build for linux, attempt #2
Only first character of the filename is capitalised, works happily for windows though
Merge branch 'develop' of https://github.com/BladeRunnerJS/brjs into develop
Checking in fix which previous commit didn't pick up for some reason
'UserLib' -> 'Userlib'
treating functions in inline maps as static dependencies - fixes #708
Merge branch 'develop' of github.com:BladeRunnerJS/brjs into develop
renaming bladerunner.conf to brjs.conf - fixes #280
allowing non versioned content plugin URLs - fixes #725
Adding @Ignore test for #712
Merge branch 'develop' of https://github.com/BladeRunnerJS/brjs into develop
Changing test back to how it was previously.
Merge branch 'develop' into fixing-jsp-support

Conflicts:
	brjs-core/src/main/java/org/bladerunnerjs/utility/AppRequestHandler.java
	brjs-core/src/test-integration/java/org/bladerunnerjs/spec/brjs/appserver/ServedAppTest.java
	brjs-core/src/test/java/org/bladerunnerjs/testing/utility/MockContentPlugin.java