Merge branch 'master' into feature/web-plugin-deployment
Merge remote-tracking branch 'origin/web-ui-plugin-support' into feature/web-plugin-deployment
Merge remote-tracking branch 'origin/fixes/remove-proxy-example' into feature/web-plugin-deployment
Working on getting the deployment structure right.

Not tested yet. Still need to:

- Check the filters
- Check the output structure before running
- Make a start script
Merge remote-tracking branch 'origin/master' into feature/web-plugin-deployment
Merge branch 'master' into feature/web-plugin-deployment
Server now compiles to a proper distribution
Merge branch 'web-ui-plugin-support' into feature/web-plugin-deployment
Merge remote-tracking branch 'origin/web-ui-plugin-support' into feature/web-plugin-deployment

Conflicts:
	web/src/main/java/com/crawljax/web/fs/PluginManager.java
	web/src/main/java/com/crawljax/web/model/Plugin.java
Merge pull request #298 from crawljax/feature/web-plugin-deployment

Feature/web plugin deployment