modul sdm
Merge branch 'master' of git://github.com/taufiksu/simpeg

Conflicts:
	application/views/jsplugin.php