clear gitignore
Merge pull request #1479 from Technopoint/gitignore

clear gitignore
#1468 + small fix
small fix
closed #1476
Merge branch 'dev' of https://github.com/yupe/yupe into dev
Merge branch 'master' into dev