Users form doesn't warn user if no password is provided Defect #349
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	db/schema.rb
Merge remote-tracking branch 'origin/dev' into dev
Merge remote-tracking branch 'origin/dev' into dev
Advanced ratio reference
#378
Merge remote-tracking branch 'origin/dev' into dev