add gitignore
Merge branch 'release/20141204'