Merge branch 'master', remote-tracking branch 'origin'
add standalone otp classes
pull REST API out of servlet module; copy standalone OTP module in
change cmd line param
replace all _log identifiers with LOG, addresses #1091
Test committing
Test commit
Revert test
additional work on alerts module -- includes initial templating refactoring
Added small unit test to test banned trips
Revert testing commit
Merge remote-tracking branch 'upstream/master'
Merge pull request #1095 from jkoelewijn/master

Added small unit test to test banned trips
Allow easier usage of OTP-standalone
Merge pull request #1099 from goabout/e5c2a60cd578341b4c761183293e95c864b499f2

 Allow easier usage of OTP-standalone
Merge branch 'master' of git://github.com/flibbertigibbet/OpenTripPlanner
Merge branch 'master' of git://github.com/openplans/OpenTripPlanner