Revert "Merging changes to develop from feature branches"

This reverts commit e390b6f08df16c9fbeb8c68c227f83223563cbbb.
Revert "Revert "Merging changes to develop from feature branches""

This reverts commit 91cf10a1c5a5a24ba6b127b1090ff8c3c96c07ab.
Added test, modified ldap settings, modified models

Modified models by re-factoring some errors that were there such as
classes having __unicode__ returns but were not models. Added more test,
the tests are for new added models functionality, and added ldap
settings to allow for communication with the server
Added test, re-factored models
all changes to models
api refactored regarding assessments
changes for the day: added views
tests for views added
all views combined with tests
made changes to the business logic

made changes to the api function names, added more test
Complete Aggregate Assessment Tests
merging differences before testing
base branch to work from this week
web service app
edited the naming of functions in the views
added web services views
added the re-factored api
added web services views
updated web services views
got the login use case to work