Populate will now add dummy account data
Merge branch 'develop'

Conflicts:
	app/models/user.rb