* add */cache/* to gitignore
* delete empty lines
Merge branch 'develop'