CURRENTLY WORKING 9/3/14
Merge remote-tracking branch 'origin/master'

Conflicts:
	cpp-code/NewPolyGrid.cpp