Merge branch 'master' of github.com:dstockto/joind.in
JRA-319 #resolve #comment Set lat and long to 0.0, 0.0 set zoom to 0 also.
Merge branch 'master' of github.com:dstockto/joind.in
Merge branch 'joindin-319'
Removed dependency on APIv2 being in the main repo
make phing fail if any of its exec calls fail
Make the event stub NULL instead of an empty string if not set, due to the unique constraint in the DB
we don't use blog functionality on the site any more
switching the popular talks out for a much less expensive query that does the most-commented recently-ish instead
add a limit to the event listing, only show the first hundred
return 'only' 50 events when the user requests a list via the API
updating to reflect the new API docs. Marking the v1 API as no longer supported
We really don't need to advertise API v1.
removing the only uses of short open tag - this project is still 5.3 compliant and we don't want to require it
Merge branch 'lornajane-minimise-performance-penalties'
Merge pull request #786 from lornajane/no-short-open-tag

Remove the only 2 situations where a short open tag was used; the VM is not configured for this and we don't need it
Switching around comment form and existing comments
This is to better avoid rating biasing.
If you havent rated a talk yet, then having
to scroll past other peoples views will slight
your review.
Merge branch 'pr787'