Web Server structure setup
common LoginBean  
updates bean - common + adding template - web server
config almost ok - The class 'aic12.project3.common.beans.UserBean' does
not have the property 'companyName' exception
config ok - first page loaded without exceptions
request reorganised - action to be configured
page navigation - header
style + datepicker
response + required text fields
ok
before rest impl
rest: get user + get past requests implemented
random git
git merge with local master branch
git merge with local master 2
Merge branch 'master' into webserver

Conflicts:
	analysis/src/main/java/aic12/project3/analysis/rest/SentimentService.java
	analysis/src/main/java/aic12/project3/analysis/rest/TestClient.java
	common/pom.xml
	common/src/main/java/aic12/project3/common/beans/SentimentRequest.java
	common/src/main/java/aic12/project3/common/dto/UserDTO.java
	common/src/main/java/aic12/project3/common/enums/NODE_STATUS.java
	common/src/main/java/aic12/project3/common/enums/REQUEST_QUEUE_STATE.java
	dao/src/main/java/aic12/project3/dao/ITweetDAO.java
	dao/src/main/java/aic12/project3/dao/MongoTweetDAO.java
	dao/src/main/java/aic12/project3/dao/MongoUserDAO.java
	dao/src/main/java/aic12/project3/dao/rest/Test.java
	dao/src/main/java/aic12/project3/dao/rest/TweetDAOService.java
	dao/src/main/java/aic12/project3/dao/rest/UserDAOService.java
	dao/src/main/java/aic12/project3/service/DownloadManagerService.java
	dao/src/main/java/aic12/project3/service/DownloadManagerServiceImpl.java
	dao/src/main/java/aic12/project3/service/DownloadThread.java
	dao/src/main/java/aic12/project3/service/TwitterAPI.java
	dao/src/main/java/aic12/project3/service/TwitterAPIImpl.java
	dao/src/main/java/aic12/project3/service/WriteCachedToDaoStreamListener.java
	dao/src/main/java/aic12/project3/service/rest/DownloadManagerRestInterface.java
	dao/src/main/java/aic12/project3/service/test/DownloadManagerServiceTestIF.java
	dao/src/main/resources/app-config.xml
	dao/src/test/java/aic12/project3/service/DownloadManagerServiceTest.java
	dao/src/test/java/aic12/project3/service/TwitterAPITest.java
	dao/src/test/java/aic12/project3/service/WriteCachedToDaoStreamListenerTest.java
	dao/src/test/java/aic12/project3/service/manualTest/DownloadManagerRestTest.java
	management/src/main/java/aic12/project3/dao/tweetsManagement/DownloadManagerClient.java
	management/src/main/java/aic12/project3/dao/tweetsManagement/DownloadManagerClientRestImpl.java
	management/src/main/java/aic12/project3/service/app/App.java
	management/src/main/java/aic12/project3/service/communication/CommunicationService.java
	management/src/main/java/aic12/project3/service/communication/CommunicationServiceImpl.java
	management/src/main/java/aic12/project3/service/loadBalancing/LoadBalancer.java
	management/src/main/java/aic12/project3/service/loadBalancing/LoadBalancerTime.java
	management/src/main/java/aic12/project3/service/nodeManagement/JCloudsNodeManager.java
	management/src/main/java/aic12/project3/service/nodeManagement/Node.java
	management/src/main/java/aic12/project3/service/requestManagement/RequestAnalysis.java
	management/src/main/java/aic12/project3/service/requestManagement/RequestAnalysisImpl.java
	management/src/main/java/aic12/project3/service/requestManagement/RequestQueueReady.java
	management/src/main/java/aic12/project3/service/requestManagement/RequestQueueReadyImpl.java
	management/src/main/java/aic12/project3/service/rest/RequestService.java
	management/src/main/java/aic12/project3/service/statistics/Statistics.java
	management/src/main/java/aic12/project3/service/statistics/StatisticsImpl.java
	management/src/main/resources/applicationContext.xml
	management/src/main/resources/config.properties
	management/src/test/java/aic12/project3/service/loadBalancing/LoadBalancerTest.java
	management/src/test/java/aic12/project3/service/requestManagement/RequestAnalysisTest.java
	management/src/test/java/aic12/project3/service/requestManagement/RequestQueueReadyTest.java
	management/src/test/java/aic12/project3/service/rest/JerseyTestNG.java
	management/src/test/java/aic12/project3/service/rest/RequestServiceSpringTest.java
	management/src/test/java/aic12/project3/service/rest/manualTests/DownloadManagerTest.java
Merge branch 'master' into webserver

Conflicts:
	analysis/src/main/java/aic12/project3/analysis/rest/SentimentService.java
	common/src/main/java/aic12/project3/common/beans/SentimentRequest.java
	common/src/main/java/aic12/project3/common/dto/UserDTO.java
	common/src/main/java/aic12/project3/common/enums/NODE_STATUS.java
	dao/src/main/java/aic12/project3/dao/IRequestDAO.java
	dao/src/main/java/aic12/project3/dao/ITweetDAO.java
	dao/src/main/java/aic12/project3/dao/MongoRequestDAO.java
	dao/src/main/java/aic12/project3/dao/MongoTweetDAO.java
	dao/src/main/java/aic12/project3/dao/MongoUserDAO.java
	dao/src/main/java/aic12/project3/dao/rest/RequestDAOService.java
	dao/src/main/java/aic12/project3/dao/rest/Test.java
	dao/src/main/java/aic12/project3/dao/rest/TweetDAOService.java
	dao/src/main/java/aic12/project3/service/DownloadManagerService.java
	dao/src/main/java/aic12/project3/service/DownloadManagerServiceImpl.java
	dao/src/main/java/aic12/project3/service/DownloadThread.java
	dao/src/main/java/aic12/project3/service/TwitterAPI.java
	dao/src/main/java/aic12/project3/service/TwitterAPIImpl.java
	dao/src/main/java/aic12/project3/service/WriteCachedToDaoStreamListener.java
	dao/src/main/java/aic12/project3/service/rest/DownloadManagerCallbackClient.java
	dao/src/main/java/aic12/project3/service/rest/DownloadManagerCallbackClientRestImpl.java
	dao/src/main/java/aic12/project3/service/rest/DownloadManagerRestInterface.java
	dao/src/main/java/aic12/project3/service/test/DownloadManagerServiceTestIF.java
	dao/src/main/resources/app-config.xml
	dao/src/test/java/aic12/project3/service/DownloadManagerServiceTest.java
	dao/src/test/java/aic12/project3/service/TwitterAPITest.java
	dao/src/test/java/aic12/project3/service/WriteCachedToDaoStreamListenerTest.java
	dao/src/test/java/aic12/project3/service/manualTest/DownloadManagerRestTest.java
	management/src/main/java/aic12/project3/dao/tweetsManagement/DownloadManagerClient.java
	management/src/main/java/aic12/project3/dao/tweetsManagement/DownloadManagerClientRestImpl.java
	management/src/main/java/aic12/project3/service/app/App.java
	management/src/main/java/aic12/project3/service/communication/CommunicationService.java
	management/src/main/java/aic12/project3/service/communication/CommunicationServiceImpl.java
	management/src/main/java/aic12/project3/service/loadBalancing/LoadBalancer.java
	management/src/main/java/aic12/project3/service/loadBalancing/LoadBalancerTime.java
	management/src/main/java/aic12/project3/service/nodeManagement/JCloudsNodeManager.java
	management/src/main/java/aic12/project3/service/nodeManagement/Node.java
	management/src/main/java/aic12/project3/service/requestManagement/RequestAnalysis.java
	management/src/main/java/aic12/project3/service/requestManagement/RequestAnalysisImpl.java
	management/src/main/java/aic12/project3/service/requestManagement/RequestQueueReady.java
	management/src/main/java/aic12/project3/service/requestManagement/RequestQueueReadyImpl.java
	management/src/main/java/aic12/project3/service/rest/RequestService.java
	management/src/main/java/aic12/project3/service/statistics/Statistics.java
	management/src/main/java/aic12/project3/service/statistics/StatisticsImpl.java
	management/src/main/resources/applicationContext.xml
	management/src/main/resources/config.properties
	management/src/test/java/aic12/project3/service/loadBalancing/LoadBalancerTest.java
	management/src/test/java/aic12/project3/service/requestManagement/RequestAnalysisTest.java
	management/src/test/java/aic12/project3/service/requestManagement/RequestQueueReadyTest.java
	management/src/test/java/aic12/project3/service/rest/JerseyTestNG.java
	management/src/test/java/aic12/project3/service/rest/RequestServiceSpringTest.java
	management/src/test/java/aic12/project3/service/rest/manualTests/DownloadManagerTest.java
ready for testing
login working
Merge branch 'master' into webserver

Conflicts:
	common/src/main/java/aic12/project3/common/enums/NODE_STATUS.java
	management/src/main/java/aic12/project3/dao/tweetsManagement/DownloadManagerClientRestImpl.java
	management/src/main/java/aic12/project3/service/app/App.java
	management/src/main/java/aic12/project3/service/communication/CommunicationService.java
	management/src/main/java/aic12/project3/service/communication/CommunicationServiceImpl.java
	management/src/main/java/aic12/project3/service/loadBalancing/LoadBalancerTime.java
	management/src/main/java/aic12/project3/service/requestManagement/RequestQueueReadyImpl.java
	management/src/main/java/aic12/project3/service/rest/RequestService.java