boot-initial vertical slice -- stable with login -- happy coding Team MG
xit controller error because of SSL errors
fixed merge conflict in users show view
Merge branch 'bootstrap_htc'

Fixed merge conflicts in user show view