Security: use https for fetching artifacts. See http://blog.ontoillogical.com/blog/2014/07/28/how-to-take-over-any-java-developer/
Fixes the Flowdock token id
Merge pull request #682 from typesafehub/wip/h3nk3-flowdock-token

Fixes the Flowdock token id
Merge pull request #680 from typesafehub/wip/havocp-from-1.2.x

Pick 1.2.x version bumps back to master
Fail WebSocket CSRF check with Forbidden status

Play 2.3 made it possible to return specific results to reject a
WebSocket, rather than just rejecting with an 500 error, so this change
takes advantage of that.

Note though that browsers don't allow you to handle this error in any
way :(.  So in addition to that, I log a warning, in case this does
happen, this will mean users report bugs with the warning, rather than
bugs saying that nothing happened.
Merge pull request #695 from jroper/websocket-forbidden

Fail WebSocket CSRF check with Forbidden status
Merge pull request #674 from benmccann/https-repos

Security: use https for fetching artifacts
Fix UNC path problem on Windows when reading activator home and
local repository locations
Merge pull request #697 from rpnguyen/windows-unc-path-fix

Fix IllegalArgumentException on Windows when using UNC paths
Change proxy auth setup in launcher to always happen

We need to do it globally on startup, not only when checking
for a new version. That way it also works for "activator new".
Once we do it, we should not need to supply a Proxy to
URL.openConnection - if we did need a custom openConnection,
we'd have to go fix a whole bunch of other openConnection cases
too, such as in sbt-io.
If we can't read "theAuthenticator" log a debug message

Might help if future-Java changes the field name or something.
Merge pull request #767 from typesafehub/wip/havocp-proxy-auth

Change proxy auth setup in launcher to always happen
Closes #649: java_cmd should not be declared readonly since the command-line parsing overwrites it
Merge pull request #779 from sethyates/master

Closes #649: java_cmd should not be declared readonly since the command-line parsing overwrites it
Merge branch 'master' into wip/h3nk3-master-merge

Conflicts:
	.travis.yml
Merge pull request #804 from typesafehub/wip/h3nk3-master-merge

Wip/h3nk3 master merge