solved login problem (adrian)
Merge branch 'master' of http://github.com/ScottLong/StayWell.git