Moving to 1.x branch
Merge pull request #5 from SU-SWS/7.x-1.x-jsadev

Moving to 1.x branch