Blender Git Loki

Merge branch 'master' into pointcache

Conflicts:
release/scripts/startup/bl_ui/properties_physics_common.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/BKE_pointcache.h
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_legacy.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/physics/physics_pointcache.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_fluidsim.c
source/blender/modifiers/intern/MOD_cloth.c
source/blender/modifiers/intern/MOD_collision.c
source/blender/modifiers/intern/MOD_particleinstance.c
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/WM_api.h
source/creator/CMakeLists.txt