Fix merge of git modules

Merge branch 'master' of https://github.com/maxious/ACTBus-ui

Conflicts:
.gitmodules
myway/myway_timeliness_route.json.php
myway/myway_timeliness_stop.php

Remove AWS SES from feedback email

Spring/summer cleaning - disable inactive labs projects, remove Amazon AWS references

More PHP 5.4 fixes

Use yepnope for lazy loading JS

Fix myway_timeliness_route

Merge branch 'master' of github.com:maxious/ACTBus-ui

Move static resources off amazon S3

Add amon monitoring hook

Fix service alerts code standards

Fix html validation errors on trip view

Fix minor code standards issues

add binary protobuf GTFSRT format

Rename servicealerts to local terminology "Real Time Passenger Information System"

Fix service alert filtering

Fix street closure service alerts

Fix service alert display and include stop/route filters

URL parameter to filter stop trips display by route or another stop on the route

Upgrade graphs to Flotr2

Show two directions and stops on routes/trips KML
Don't close include files else any trailing whitespace ends up in XML documents

Ensure all variables are initialised in nearby routes codepath

Merge branch 'master' of github.com:maxious/ACTBus-ui

DB permission update

KML for trips/routes/stops fixed

Bump jQuery Mobile version to 1.0.1

Fix php syntax issues

Merge branch 'master' of ssh://apples.lambdacomplex.org/git/busui

Conflicts:
include/common-template.inc.php

Fix search routes by final destination

Kudos for Bus Trips ACT by Molson Chengalath

Don't show letters in lists that don't have entries

Public holiday consideration in myway timeliness

Consider route direction in myway timeliness

2012 Summer school holidays timetable selection

Avoid validation for cheap SSL certificates used by Transport for Canberra

Display stop page title as street the stop is on.

Fix nearest routes/trips

Fix time navigation and too many trips displayed on stops display

Fix trip/route view now that routeids are back to route numbers

Happy New Year! Remove Christmas special holiday timetable support.

Kudos for GetMe2 Canberra

Beginnings of Christmas 2011 support

New simple service ID

Use PDO prepared statements for massive import speedup

Include tokenizer for NLTK service alert tweet parsing

Merge branch 'master' of github.com:maxious/ACTBus-ui

Unify route list rendering

Stop using session for time/day

Try to adapt to new route destination detection

Merge branch 'master' of github.com:maxious/ACTBus-ui