Merge branch 'master' into development
...
Fix a width issue with Current Test
Odd button style bug
Odd button style bug
Move view refactor to edit
add view and edit should all now have new css/html
wrong modal on add
Merge branch 'development'