initial check in of captcha
Merged dev into login_limit
Added console.php
Removed console.php
Merge branch 'dev' into login_limit

Conflicts:
	egowebWebApp/protected/config/main.php.bak
Merge branch 'login_limit' of https://github.com/qualintitative/egoweb into login_limit

Conflicts:
	egowebWebApp/js/sigma.notes.js
	egowebWebApp/plugins/visualize.php
	egowebWebApp/protected/views/data/visualize.php
	egowebWebApp/protected/views/interviewing/view.php
Merge pull request #3 from qualintitative/login_limit

Merging in Paul's login_limit branch after resolving merge conflicts.