Added analytics code & fixed captcha error
Merged conflicts