Merge branch 'bestja_email_confirmation2' of https://github.com/jerdzica/bestja into bestja_email_confirmation2

Conflicts:
	addons/bestja_email_confirmation/__init__.py
	addons/bestja_email_confirmation/__openerp__.py
	addons/bestja_email_confirmation/bestja_email_confirmation_data.xml
	addons/bestja_email_confirmation/views/bestja_email_confirmation_signup.xml
Merge branch 'bestja_email_confirmation2' of https://github.com/jerdzica/bestja into bestja_email_confirmation2