Fix gitignore
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
cleanup + facebook
Merge remote-tracking branch 'origin/develop' into develop