js test enabled for hybrid applications
Merge branch 'master' of https://github.com/phresco/plugins

Conflicts:

java-phresco-plugin/src/main/java/com/photon/phresco/plugins/java/JavaTe
st.java