Fixed my own login issues
Merge some of charle's work
Merge https://github.com/glittergallery/GlitterGallery into charlesx2013-myMaster