Adding to KheerKadam branch.
Merge remote-tracking branch 'origin/KheerKadam' into devel

Conflicts:
	CMakeLists.txt
	Demos/neuroml/GranuleCell/cells_channels/Gran_KCa_98.xml
	Demos/neuroml/OlfactoryBulbPassive/cells/PG.xml
	Demos/neuroml/OlfactoryBulbPassive/cells/granule.xml
	Demos/neuroml/allChannelsCell/cells_channels/Gran_KCa_98.xml
	Demos/neuroml/allChannelsCell/cells_channels/SolinasEtAl_Golgi/KAHP_CML.xml
	Docs/README.txt
	Docs/markdown/README.markdown
	Docs/user/README.txt
	Docs/user/markdown/Kkit12Documentation.markdown
	Docs/user/markdown/MooseGuiDocs.markdown
	Docs/user/markdown/Nkit2Documentation.markdown
	Docs/user/markdown/index.markdown
	Docs/user/markdown/pymoose2walkthrough.markdown
	Docs/user/py/README.txt
	basecode/CMakeLists.txt
	basecode/main.cpp
	biophysics/CMakeLists.txt
	builtins/CMakeLists.txt
	examples/Ex.cpp
	examples/Ex.h
	gui/plugins/PreferencesPresenter.py
	gui/plugins/PreferencesView.py
	kinetics/CMakeLists.txt
	ksolve/CMakeLists.txt
	mpi/CMakeLists.txt
	pymoose/CMakeLists.txt
	randnum/CMakeLists.txt
	sbml/CMakeLists.txt
	sbml/SbmlWriter.cpp
	scheduling/CMakeLists.txt
	scripts/moose.desktop
	synapse/CMakeLists.txt
	utility/Annotator.cpp