Merge branch 'master' into pass_encrypt

Conflicts:
	app/models/user.rb
	app/views/auth/login.erb
	app/views/layout.erb
	db/db.sqlite3
	db/migrate/20140327201112_adding_password_encryption.rb
	db/schema.rb
Merge branch 'pass_encrypt' of github.com:romanchukenator/ditto into pass_encrypt

Conflicts:
	app/models/user.rb
	app/views/auth/login.erb
	app/views/layout.erb
	db/db.sqlite3