Fix Turkish localisation format
Remove unused imports
Merge branch 'master' of git://github.com/openplans/OpenTripPlanner into master-opt
Merge branch 'master' of git://github.com/openplans/OpenTripPlanner into master-opt
Merge branch 'master' of git://github.com/openplans/OpenTripPlanner into master-opt
Add some comments.
Comments.
Merge branch 'master' of git://github.com/openplans/OpenTripPlanner into master-opt
Remove unused imports
Add preferred and unpreferred agencies.

Extract the banned and preferencesPenality logic in RoutingRequest since it was repeated 3 times.
getNumItineraries() should return an int, since that's the type of the variable and what the getter is getting. That would also make impossible to set numItineraries in the applicaiton-context.xml
Fix preferencesPenaltyForTrip to actually use preferred and unprefered agencies
Don't change anything when there are not preferred routes
Fix testSetNumItineraries test
Merge pull request #1023 from gcamp/master-opt

Add preferred and unpreferred agencies and fix other issues
spelling (singular form)
move comment
Merge remote-tracking branch 'upstream/master'