Merge branch 'Build-setup'
more package.json

trying to get grunt-bower task to stop complaining about package.json
being malformed.
updating WorklightStore for Worklight 6
Merge branch 'master' into Build-setup
early build additions
more test