generate .gitignore with http://www.gitignore.io
version up
Merge branch '20140722'