Merge branch 'master' of git://github.com/aycanirican/haste-compiler
Merge branch 'master' of git://github.com/aycanirican/haste-compiler