my acc
Merge branch 'master' of https://github.com/sbushinskii/tao-room

Conflicts:
	gocart/themes/default/views/my_account.php
123