wip
Merge branch 'develop' of github.com:Shhu/todo-laravel-4 into develop