Added cypto to support the crypto.js hash function
Merge branch 'james_branch' into dev