Code cleanup / Cycles: Remove some unused hair code.
BMesh API: optionally pass fallback to BM_edge_calc_face_angle functions
Modeling: add optional angle limit for beauty fill

Makes this tool more useful on an entire mesh by only applying
beautify to planar surfaces.
Interface / 3D View: Add missing "add" menu for armature edit mode, reported in IRC.

Also remove an unused menu for surface/curves.
Fix T37264: cycles CPU render had limited number of float images, bumped to 1024.

GPU is still limited to 5, but there's no good reason for the CPU to be limited.
Fix bmesh compiler warning with OS X / clang.
Fix for recent regression in curve geometry panel poll
Curves: Skip 3dtext & 2d-curve filling when fill is set to 'None'

Otherwise was impossible to have unfilled curves unless extrude was set
Make libyaml-cpp-dev not-breaking case for deb-like distros, and colors for messages!
Fix T37810: GLSL dither shader not working on OS X.

The GLSL function textureSize() is not supported here, only when we start using
OpenGL core profile will this work. For now check the supported GLSL version and
use a somewhat slower replacement.
Revert "Hide the 3D cursor in a few cases where it is unneeded (active object is"

This reverts commit 85eaa989807268dda60408f41475216ad45888d1.

Conflicts:
	source/blender/editors/space_view3d/view3d_draw.c
correct error in recent commit
Fix T37816: make cycles panel registration work better with addons.

This would give an error when an addon removed a panel.
Merge branch 'master' of http://git.blender.org/blender