Rename the merge method to collapse.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Add merge method to merge in another array or collection.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Updated readme.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Merge branch 'master' of git://github.com/laravel/framework into fix/proper-merge-collections

Conflicts:
	readme.md
Creation of the setBaseURL function for Ajax requests

When using pagination in an Ajax request is useful to be able to define the URL to be consider to build the paginate links. By default, in an  Ajax request, it will be consider the Ajax URL to build the paginate links. This is a problem because generally in an Ajax response we do not rebuild the entry HTML page. To resolve this problem, we add to the Paginator class the setBaseURL function to indicate the URL to be consider. With this change we can, for example, proceed in the following way in the context of an Ajax request:

echo ‘<ul>’;
$users = User:where(‘age’, ‘>’, ’18‘)->get();
foreach ($users as $user)
{
	echo ‘<li>’.$user->name.‘</li>’;
}
$users->setBaseUrl(URL::route(‘users_list’));
echo ‘</ul>’;
$users->links();

We can use the function $users->getEnvironment()->setBaseUrl() but we think the previous solution much more simple an elegant.
Fix syntax on touches for SQLite and Postgres. Closes #1221.
Fix updates with joins on Postgres.
Fix Session::has with dot notation.
Use table helper from Symfony 2.3.
Tweak helper set.
Add smallInteger to Blueprint.
Merge pull request #1241 from KaneCohen/smallint

Add smallInt type to Blueprint.
Merge pull request #1237 from miguelbgouveia/patch-1

Creation of the setBaseURL function for Ajax requests
Cleaning up code. Updating readme.
Set exists to true before firing created method. Fixes #1235.
Update StoreInterface.php

Minor typo in interface comment
Merge pull request #1248 from helmut/typo-fix

Update StoreInterface.php
Don't set cookie if headers have been sent.
Fix missing select clause on some queries. Closes #1236. Closes #1223.
Fix encryption pad handling. Fixes #1238.