merge
Merge branch 'master' of https://github.com/dev0x13/roxifi

Conflicts:
	themes/initial/views/layouts/main.php
	themes/initial/views/users/profile/wallRecord.php