maria
Merge branch 'master' of /home/tom/Dropbox/FSM/firesafe

Conflicts:
	models/send_item.hsm
	models/send_item.rules