Added directive and controller for a dropdown menu in the header. Still needs some work.
Merge remote-tracking branch 'upstream/develop' into develop

Need to test if signout is moving significantly slower than usual.
preparing to put everything into its own branch.
Added most front end aspects of user profile. Need to fix up styling and write tests for the user profile.
Got most recent changes from upstream/develop.
Completed work on user settings modal. Added test cases for the modal creation service. If needed in the future, will require some refactoring to allow for a more general case of modal.
refactored modalservice to allow for generic modals to be created. Refactored tests to communicate this.
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Updated settings.
Vagrantfile was somehow deleted from a previous commit
Update application.js
Update application.js
A couple of small fixes to see logging and fix the consent wizard when not signed in.
Fix Travis timeout.
Merge remote-tracking branch 'staging/develop' into develop
Merge pull request #126 from eric-wu/develop

Fix Travis timeout
Trying to speed up tests from 50 min timeout
Merge pull request #127 from alxdarksage/fix

Fix
fixed hash conflict to resolve merge conflict.