Merge branch 'master' into captcha
html for captcha added to advisors
captcha now also required when you log in as advisor
was written <? instead <?php some places causing php displayed as html
Merge remote-tracking branch 'origin/captcha'