change login nav
better user factory
span12 for main div
Merge branch 'master' into devise