mockup to do the login.html
Merge branch 'develop' of
https://github.com/CS673F14P4/ProjectManagementTool.git into develop

Conflicts:
	ProManageREST/src/bu/met/cs/cs673/pm/jaxrs/model/User.java
	ProManageREST/src/bu/met/cs/cs673/pm/jaxrs/resource/ProjectResource.java
Merge branch 'develop' of https://github.com/CS673F14P4/ProjectManagementTool.git into develop
DanielA-DAO and REST  Story

Updated story DAO and sql. Started working with rest services for story.
Using a test method from service to try login

Not finished .
Merge branch 'develop' of https://github.com/CS673F14P4/ProjectManagementTool.git into develop
Using a single page with ng-view to load the content of other pages
inside. 

Using routers
Put all the controllers inside app.js
*Modal with problem to import scripts
Merge remote-tracking branch 'origin/develop'
Presentation 2