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

Conflicts:
include/common-auth.inc.php
lib/openid-php/Auth/OpenID/Consumer.php
lib/openid-php/Auth/OpenID/Server.php
lib/openid-php/Auth/OpenID/TrustRoot.php
lib/openid-php/Auth/Yadis/Manager.php
lib/openid-php/Auth/Yadis/XRDS.php

file:b/.box (new)
  shared_writable_dirs:
  - /labs/tiles
  - /lib/staticmaplite/cache
  php_extensions: [pgsql, pdo, pdo_pgsql, curl]
 
file:b/.gitignore (new)
 
  /labs/tiles/12
  /labs/tiles/13
  /labs/tiles/14
  /labs/tiles/15
  /labs/tiles/16
  /labs/tiles/17
  /labs/tiles/19
  /nbproject/private/
file:a/about.php -> file:b/about.php
<?php <?php
  /*
  * Copyright 2010,2011 Alexander Sadleir
   
  Licensed under the Apache License, Version 2.0 (the "License");