Blender Git Loki

Merge branch 'master' into gooseberry

Conflicts:
release/scripts/startup/bl_ui/properties_particle.py
source/blender/blenkernel/BKE_cloth.h
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/physics/particle_edit.c
source/blender/makesdna/DNA_particle_types.h
source/blender/physics/BPH_mass_spring.h
source/blender/physics/intern/BPH_mass_spring.cpp
source/blender/physics/intern/implicit_blender.c