test

test
Merge pull request #12 from CS673F14P4/Louie_branch

femi
Merge pull request #13 from CS673F14P4/Louie_branch

Louie branch
Merge remote-tracking branch 'origin/develop' into olufemiBranch2
Add routeparams to projectview to retrieve the project id from URL
Update to User part of ProManageREST by Olufemi
Fix the bug with accordion elements
Using setTimeout to simulate a service request to get TasksByStoryID
Using spinner gif to be showed until the service responses
Updating list of tasks after the timeout
[all mocked up, nothing really integrated with service]
Revert "Using setTimeout to simulate a service request to get TasksByStoryID"

This reverts commit a389eb5261172b3c822c88206ad7c2776d62900c.
DanielA-Class path
Revert "DanielA-Class path"

This reverts commit b6cafc3b235f071b7865a0029e1905bafeaedd8a.
Merge remote-tracking branch 'origin/master' into dan_develop
Refactoring app.js
New validation for forms
Merge branch 'olufemiBranch2' into develop

Conflicts:
	ProManageREST/src/bu/met/cs/cs673/pm/jaxrs/model/User.java
	ProManageREST/src/bu/met/cs/cs673/pm/jaxrs/resource/UserResource.java
Resolving error from previous merge
Daniel.A- Database updates

Added constraints to story and task tables.
Updating controller for form to create new project.
Using login box instead login page
correcting error previous commit