bug fixed removed space
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/acidsmile/craglogger
tweak to sql for activation code
updated to handle password reset
Merge remote-tracking branch 'upstream/master'