test

test
Merge remote-tracking branch 'origin/develop' into ray_branch
Test commit

Trying github
Getting from develop
update export sql
Task code
Merge branch 'ray_branch' of https://github.com/CS673F14P4/ProjectManagementTool into ray_branch

Conflicts:
	ProManageDAO/sql/cs673_export.sql
Refactoring Task Code
removing bin folder
Logout
Resolving bugs with Task DAO
Merge remote-tracking branch 'origin/ray_branch' into develop

Conflicts:
	ProManageDAO/sql/cs673_export.sql
GetTaskByStoryId service
Returing projectID in getProjects Service
File forgotten last commit
Resolving Login Problem with resources

Changing how to handle the data from services in javascript, since it
changed

Including StoryID in DTO

Return list in storiesByProject instead of wrapper

Getting TaskByStory service, using in UI
Refactoring if statement to task accordion
Limiting story status to 0,1 or 2


Members get correct services, using list instead of wrapper
Update Story when user clicks to "play" or to "end" a story in the UI
Create Story service
Using modalNewStory as a normal page until figure out how to make the
modal work again
Contact Us page, changes in header, small changes in index and about us, signup form.
MarionL - added registration servlet.

Added a servlet to do registration since I couldn't get REST service to
work in an unprotected fashion (the multiple RestServlet approach didn't
work).