Merge pull request #1 from phalcon/master

update
Merge pull request #2 from phalcon/1.2.1

1.2.1
Add a parameter for the function setFileToSend, showing up in the Browser instead of to download.
Add a parameter for the function setFileToSend
Merge pull request #857 from dreamsxin/master

Add a parameter for the function setFileToSend