Christiano, Kevin 2827cffd1f Merge branch 'develop' into feature/label_conversion ... # Conflicts: # MVMCoreUI.xcodeproj/project.pbxproj		2019-04-09 14:45:55 -04:00
..
Buttons	Merge branch 'feature/molecule_testfields' into 'develop'	2019-04-04 13:52:20 -04:00
TextFields	small formatting fixes	2019-04-04 09:47:45 -04:00
Views	Merge branch 'develop' into feature/label_conversion	2019-04-09 14:45:55 -04:00