Fix T40948: Fill holes fails in certain case
Fix T41173: CM view selection is difficult with multiple views

Use drop-down menu instead of expanded enum for the view select.
There are usually more views than displays and using drop-down
for display device and expanded enum for view is kindof strange.
ignore conflict files
Revert "ignore conflict files"

This reverts commit 7d20ad6a1ba46cad209d17d144af1cffbab334fc.

turns out this hides conflicts which we may want to see
Quiet reorder warning
BGE: move macro body into a function to reduce code-size
Switch linux buildbot to custom built python2.7

New scons discontinued support of python2.6, so we needed
to build just another python in the release and buildbot
environment.

Hope latest scons upgrade a least bring new msvs support
and not only lead to just-another-frustration.

There might be some more upcoming commits, because you
never can be sure there's no typos in the buidbot script
for until you actually fire the builder up.
Fix crash on edit mode with multi-align project
Cycles OpenCL error to string removed in favour of the same function in clew.
Fix to get iTaSC working again in the BGE
BGE: Fix bug with Steering Actuator Python API.

It was not possible to set the navmesh attribute from Python due to a double bug.
Intensity and color are now adjusted upon import to get correct values
UI: show ttips even if disabled, when holding alt key.

Patch by @sambler (Shane Ambler), with minor edits by myself (see also D727, T24055).
Reviewed feature-side by @carter2422 (Jonathan Williamson).
Remove an assert in Bullet for the Character physics.

This assert happens all the time for character physics in debug mode.
In release mode, the assert is skipped but the code is still incorrect
although it does not cause any crash strangely.
BGE: fix a bug causing frequent crash on scene restart with navmesh.
Fix T41381: Moving shapes keys up/down, after last, they don't go to first (as Vertex Group).

Was more a feature request actually, but anyway...

Note this is a bit more complex than it's vgroups counterpart, since we have to handle
relations between keys (relative keys, and position for absolute ones).
Fix T41295: Rigid bodyfield weights not working.??

Looks like `rna_EffectorWeight_update()` was not really working, now uses same kind of code
as `rna_Physics_update()` from rna_scene.c.
Minor tweak to own previous shapekey_move commit.
Fix for rB3cd2c6145ae1.

ID using EffectorWeight is not always a scene...
Fix T41385

Pretty old bug, reset flag to not use color transform by default.