[bug] - Account record can't be saved due to password validation
 * Found what looks to be a simple way to enforce validation only if
   password has changed
 * Scenario update password (ie. update only happens when new password
   meets the criterea)
 * However attempt to update password with a string shorter than the
   minimum length results in the update failing silently. A check needed
   on the front-end for this
- accidental commit, removed file
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/models/account.rb
Merge remote-tracking branch 'heroku/master'
[correction] Path to scan preview
Merge remote-tracking branch 'heroku/master'
Merge pull request #35 from adamarla/master

Correction to js