Updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	dist/gitana.js
	js/gitana/Transaction.js