documentation
Merge branch 'master' of acpsdev2.gsfc.nasa.gov:public_git/Clustericious-Client

Conflicts:
	Changes