changes

d
Merge branch 'master' of https://github.com/Weldeasy/godcode

Conflicts:
	application/views/frontend/panel_inici/detailservei.php
	application/views/frontend/panel_inici/logued.php
	application/views/frontend/panel_inici/mostra_detailservei.php
	application/views/frontend/user_settings/solicitud.php
	media/css/style.css
Merge branch 'master' of https://github.com/Weldeasy/godcode