modify upload_cloud
Added password recovery email functionality
resolve conflict
Merging with Jeff and MiClowe
Merge branch 'master' of github.com:jeffthestampede/cssdash

* 'master' of github.com:jeffthestampede/cssdash:
  Added password recovery email functionality
  modify upload_cloud
fixes login bug devise authenticates user except for :html and :css methods