Development branch master (1.2-dev)

Includes fixes for TWBS3 style login form.