fixes #112
fixes #121

Thanks to you both
Fix Woodling relationships
Returning Woodling relationship
Merge pull request #122 from rkrv/woodling-fix

Woodling relationship fix. Awesome! Thanks for addressing this issue. Thanks for your package as well.
Added the option to auto-detect the language of the site visitor's browser. The whole process is done in filters.
Merge branch 'datatables' of https://github.com/nekwebdev/Laravel-4-Bootstrap-Starter-Site

Conflicts:
	app/config/packages/jasonlewis/basset/config.php
	app/filters.php
app/views/admin/blogs/create_edit.blade.php
Adjusting the new stuff
Adjusting views
Regenerated ide helper for latest version

For both changes in Laravel and the IDE helper.
Merge pull request #129 from barryvdh/master

Updated IDE Helper. Thanks @barryvdh
Reverse optimize/generate order

Generator has to be run before compiled.php is created.
Merge pull request #130 from barryvdh/patch-1

Reverse optimize/generate order. Good call. Thank you!
Update AdminUsersController.php

change user edit view file 'admin/users/edit' and 'admin/users/create' to 'admin/users/create_edit',
Merge pull request #138 from rockfu/patch-1

Update AdminUsersController.php user edit view
Merge pull request #127 from andersondeoliveiramachado/master

Auto-detect language. Thanks! MErged
Inicio da tradução dos arquivos na pasta pt
Merge pull request #144 from marcelod/translate

Beginning of translation files in the folder pt. Thanks!
Complete tranlation of the files within the folder pt