Updated as of Aug 8, 2014
Merge branch 'master' of https://github.com/saveriob/approx-pf

Conflicts:
	matpower4.1/case_ieee123.m