Cosmin
Merge branch 'master' of https://github.com/CristianEnache/Sponsorlist

Conflicts:
	templates/default/modules/account/html.tpl
	templates/default/modules/javascript/account-main.tpl