Mucha mierda del isma, como pete le colgamos de los coj...
Merge origin/master
Merge origin/master

Conflicts:
	app/controllers/OtherUserController.php
asddasdsa
Merge origin/master

Conflicts:
	app/views/site/user/services/index.blade.php
Merge origin/master
Merge origin/master

Conflicts:
	app/views/site/user/services/index.blade.php
Merge origin/master
sda
Merge origin/master
sda
Merge origin/master

Conflicts:
	app/controllers/ServiceController.php
	app/controllers/user/UserController.php
ismarules
Merge origin/master

Conflicts:
	app/controllers/user/UserController.php
sda
Merge origin/master
sda
Merge origin/master
sda
Merge branch 'master' of https://github.com/bancTemps/m12banctemps