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
Update to User part of ProManageREST by Olufemi
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
Updating controller for form to create new project.
Using login box instead login page
correcting error previous commit
Merge branch 'olufemiBranch2' into develop

Conflicts:
	.gitignore
	ProManageREST/src/bu/met/cs/cs673/pm/jaxrs/resource/UserResource.java
Merge remote-tracking branch 'origin/dan_develop' into develop

Conflicts:
	ProManageDAO/junit/bu/met/cs/cs673/pm/dao/unit/StoryDAOtest.java
	ProManageDAO/resources/sqlmaps/story.xml
	ProManageDAO/sql/cs673_export.sql
	ProManageDAO/src/bu/met/cs/cs673/pm/dao/StoryDAO.java
	ProManageDAO/src/bu/met/cs/cs673/pm/dto/Story.java
	ProManageREST/src/bu/met/cs/cs673/pm/jaxrs/mapper/StoryMapper.java
	ProManageREST/src/bu/met/cs/cs673/pm/jaxrs/model/Story.java
	ProManageREST/src/bu/met/cs/cs673/pm/jaxrs/resource/StoryResource.java
DanielA

Issues with commit, fix in progress
DanielA

Fixed errors
StoriesByProject Service (using wrapper to return list)
Get members of a project 
	DAO
	Service
*Hiding user's password from service
Get stories from service and using in the UI

*Recommiting the spinner gif to simulate getting task
Using project/id service in the UI
List of members UI

small changes in layout