Laravel4

try to merge with master branch