Removed selenium test because of test setup faults.
Updated code base.
Resolving conflicts with repository.
Resolved conflicts in various project files.