rižica
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/Sign_In.html
	application/views/form_forgot_password.html
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
rižica