Devise user
fixtures and devise
Merge branch 'master' of github.com:bluehandtalking/live-here

Conflicts:
	coverage/.resultset.json
	coverage/index.html