12maj14.05
Merge remote-tracking branch 'origin/Sofia-gren3'

Conflicts:
	application/config/routes.php