merging from devel
fixed version
Merge branch 'devel'
still on 1.5.3
[maven-release-plugin] prepare release lantern-1.5.3
[maven-release-plugin] prepare for next development iteration
Merge branch 'devel'
[maven-release-plugin] prepare release lantern-1.5.4
[maven-release-plugin] prepare for next development iteration
Lots of tweaks to extract executables from jar #1846
better, cross platform setting of executable #1846
imports
Added support for running pluggable transports from jar to both command line and installed versions #1846
fixed resource copying
Merge pull request #1896 from getlantern/1846

Fix for flashlight executable issues #1846
Merge branch 'master' into devel
[maven-release-plugin] prepare release lantern-1.5.5
[maven-release-plugin] prepare for next development iteration
Removed erroneous warn logs
fixed resources filtering by just using a separate directory for pluggable transports closes #1846