Merge branch 'develop' of https://github.com/CS673F14P4/ProjectManagementTool into develop
Project view UI

Build new html for project view
Build Modal to New Task
Build Modal to New Story
Build Header
Small changes in appearence and js code.
Merge remote-tracking branch 'origin/dan_develop' into develop
Merge branch 'develop' of https://github.com/CS673F14P4/ProjectManagementTool into develop
Merge remote-tracking branch 'origin/dan_develop' into develop
added a mock user list to avoid hardcoding users into dropdown list
added mock usersController and changed select values for
modalNewProject.
MarionL - re-exported the data model

Re-exported data-model to include some updates to roles table.

Added a new user cyclops with password xmen to be used in application
security.
MarionL - corrected issue DAO not exported

Fixed an issue where the ProManageDAO stopped being exported to the
app-server during deploys.
MarionL - added some missing columns to user table.

Added some missing columns to user table as per Olufemi's user object.
MarionL - refactored user code.

Refactored user code for several reasons.

1. Corrected naming convention issue.
2. Duplicate classes (DAOSingleton was a copy of
SessionFactorySingleton).
3. Duplicate config (MyConfig.xml, User.xml were dups of
mybatis-local-config.xml and user.xml respectively) that were located in
incorrect place.
4. Copied the user queries down into user.xml prior to deleting the dup
file User.xml.

Modified unit test to adhere to refactored code.
Modified unit test to use "cyclops" as a user, which was added to the
data export so that all team member's data models should contain said
user.
Merge remote-tracking branch 'origin/dan_develop' into develop
MarionL - added placeholder objects for rest tier.

Modified web.xml to use property loader rather than loading classes by
hand.

Added placeholder objects and endpoints for the remaining REST objects.
Hopefully this will ensure everyone sticks to the naming conventions and
solves some of the configuration issues we've been seeing.
Merge branch 'develop' of https://github.com/CS673F14P4/ProjectManagementTool into develop
Angular controller to share data between pages.
fix modalNewStory
Merge remote-tracking branch 'origin/develop' into Louie_branch
MarionL - cleaned up database

Cleaned some rows out of the database that were no longer necessary.
Modified structure slightly for role table, as well as added a new
member table for project to user relationship.
MarionL - updated project dao to  use member tbl

Updated the projectdao to use the member table to retrieve projects
associated to a user.