Added ability to handle empty or non-unix times in the relative_time function. It first attempts to convert the date to unix time and if that fails, returns "never"
Re-add Temporary fix to remove `array to string` conversion errors in PHP 5.4 until CI remember to backport it - fix #618

See https://github.com/EllisLab/CodeIgniter/issues/1273 for bug info

Unfortunately 2.1.2 had the same bug when we updated to it.
Fix heading alignment on Activities Report

Addresses issue #619
Merge pull request #621 from mwhitneysdsu/develop

Fix heading alignment on Activities Report
Change Context Menu class to use Twitters Submenus, works alot better then the old ones
Fixed odd submenus not adding proper classes, also changed hard-coded menu classes to use the existing class params that were un-used but existing
Removed old parent-class for old submenus that are no longer needed
Updated readme, Fixed CI version number. Added link to issue tracker and link to Bug Report guide lines to help people write better bug reports
When no table was selected, controllers wouldn't build

Fixed null check that caused the function to return when $field_total
was 0.
Merge pull request #625 from mwhitneysdsu/sql

When no table was selected, controllers wouldn't build
Re-add Temporary fix to remove `array to string` conversion errors in PHP 5.4 until CI remember to backport it - fix #618

See https://github.com/EllisLab/CodeIgniter/issues/1273 for bug info

Unfortunately 2.1.2 had the same bug when we updated to it.
Merge branch 'hotfix' into develop

No changes.  (Just making sure the Git history is up to date,
after cherry-picking a commit from develop into the hotfix branch).
builder: Add quotation marks to migration files for Enum and Set - fix #613

Thanks to @michaelecho for the proof-of-concept patch
(pull request #628).
builder: switch to single quotes for Enum and Set constraint

addcslashes() is not sufficient for double-quoted strings,
because they perform $variable interpolation.  Single-quoted
strings are easier to escape correctly, so use them instead.
Redirect to installer - URI should be absolute - fix #631

I.e. Location headers should always include a domain name and a scheme,
as well as the path.  That's what the HTTP spec says.

We now use the exact same auto-detection code as CodeIgniter's
Config::__construct().  (Except I skipped the fallback to localhost
when HTTP_HOST isn't available; it doesn't make any sense to me).
theme: fix right-aligned menus after bootstrap update - #634
users profile (only): fix redirect after login

1. Make sure you're logged out
2. Visit /users/profile and log in
3. After logging in, you should be redirected bad to /users/profile

This fixes it.  I haven't root caused it yet, but fortunately
this is an obviously correct simplification :).

I notice that the custom code here was using CI redirect().
The code in auth->restrict() is using Template::redirect() instead,
which I assume is causing the difference in behaviour here.
Perhaps this is the cause of #640
Merge CodeIgniter 2.1.3

No conflicts (apart from the deleted user_guide/).

Removed the new file .travis.yml
Merge #617 - fix combine js (when enabled in config)
Merge pull request #615 into develop