Added login placeholders
Merge remote-tracking branch 'origin/propel1.6' into propel1.6