Merge branch 'dilawar' of github.com:dilawar/moose into dilawar

Conflicts:
	CMakeLists.txt
	basecode/CMakeLists.txt
	basecode/global.h
	biophysics/CMakeLists.txt
	external/debug/CMakeLists.txt
	external/debug/assert.hpp
	external/debug/print_function.cc
	hsolve/HSolvePassive.cpp
	hsolve/HSolvePassive.h
	hsolve/testHSolve.cpp
	scheduling/Clock.cpp
	shell/CMakeLists.txt
Merge branch 'dilawar' of github.com:dilawar/moose into dilawar

Conflicts:
	CMakeLists.txt
	basecode/global.h
	biophysics/CMakeLists.txt
	external/debug/CMakeLists.txt
	external/debug/print_function.cc
	hsolve/HSolvePassive.cpp
	hsolve/HSolvePassive.h
	scheduling/Clock.cpp