adding um-vis-dev
Merge branch 'master' of
https://github.com/PAWSLabUniversityOfPittsburgh/MasteryGrids

Conflicts:
	aggregate/WebContent/WEB-INF/config.xml
config_default.xml added