Merged svn
merged svn.
Merge branch 'master' of github.com:dilawar/moose

Conflicts:
	python/moose/neuroml/NetworkML.py
	python/moose/neuroml/utils.py
	python/moose/sim_utils.py
	python/moose/utils.py
	tests/python/test_mumbl.py