Removes defining the _() function if not available because it's not required any more
Fixes basket controller tests
Prepares for locale selector
Merge pull request #164 from nsendetzky/master

Prepares for locale selector, fixes tests and removes _() function definition