Merge remote-tracking branch 'esahal/master'
Merge remote-tracking branch 'mats/master'

Set Production Mode false
Modify Login Code