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

Conflicts:
	gui/plugins/kkit.py