weird changes

Signed-off-by: Karl Merkli <info@karl-merkli.ch>
Merge remote-tracking branch 'origin/master'
merging

Signed-off-by: Karl Merkli <info@karl-merkli.ch>
Merge branch 'master' of https://github.com/Itrulia/Laravel4-SublimeCompare