Added gwajs
Merge branch 'master' of https://github.com/gwa/gwastrap

Conflicts:
	bower.json
	bower_components/gwajs/.bower.json