Moving unfinished modules to 'develop' branch
Merge branch 'input_masks'

Conflicts:
	visualcaptcha/__init__.pyc
	visualcaptcha/__openerp__.py
	visualcaptcha/controllers/__init__.pyc
	visualcaptcha/controllers/visualcaptcha.py
	visualcaptcha/controllers/visualcaptcha.pyc
	visualcaptcha/static/src/js/main.js
	visualcaptcha/static/src/xml/visualcaptcha.xml
Deleting unfinished module
web_login_layout: Google-ish redesign of oerp login page.
TODO: Make it work with *_signup modules.
Replacing oerp logo image with text.
from OpenERP to Odoo
Deleting binary files .pyc
Moving unfinished module to new branch
Merge branch 'master' into develop