fix failing tests
Merge pull request #123 from ChrisBr/fix_tests

fix failing tests
change modal in view according to bootstrap3 and query in controller
fix modal dialog