Added secure_password to user model
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/book_forum.iml
Added secure_password to user model