a
28nov2014-13:25
29nov2014-00:19
01dic2014-14:38

MODIFICACION

- ClubController
* clubDAO
* ClubController(ClubDAO clubDAO)
* Result getAllClubs()
* Result getClubsByUser(Long userId)
* Result getClubById(Long clubId)
* Result createClub()
* Result updateClub(Long clubId)
* Result deleteClub(Long clubId)
* Result assignUser(Long userId, Long clubId) REVISION

- ClubProfileController
* ClubProfileDAO clubProfileDAO
* ClubProfileController(ClubProfileDAO clubProfileDAO)
* Result getAllClubProfiles()
* Result getClubProfileByClub(Long clubId)
* Result updateClubProfile(Long clubId)
* Result deleteClubProfile(Long clubId)
* Result createClubProfile()

- UserProfileController
* userProfileDAO
* UserProfileController(UserProfileDAO userProfileDAO)
* Result getAllUserProfiles()
* Result getUserProfileByUser(Long userId)
* Result updateUserProfile(Long userId)
* Result deleteUserProfile(Long userId)
* Result createClubProfile(Long userId)

- StatusCode
* COULT_NOT_ASSING

- ClubDAO
* void assignUser(Long userId, Long clubId)
1dic2014-21:14

- StatusCode
* COULT_NOT_ASSIGN

- ClubDAO
* ClubDAO(ClubRepository clubRepository)
* Club update(ClubDTO update)
* Club assignUser(Long userId, Long clubId)

- ClubController
* Result createClub()
* Result assignUser(Long userId, Long clubId)

- ClubProfileDAO
* ClubProfileDAO(ClubProfileRepository clubProfileRepository)
* ClubProfile save(ClubProfile clubProfile)

- UserProfileDAO
* UserProfileDAO(UserProfileRepository userProfileRepository)
* UserProfile save(UserProfile userProfile)
1dic2014-21:24

- UserProfileController
* Result getAllUserProfiles()
* Result getUserProfileByUser(Long userId)
1dic2014-21:31

- ClubController
* Result getAllClubs()
* Result getClubsByUser(Long userId)
* Result getClubById(Long clubId)

- ClubProfileController
* Result getAllClubProfiles()
* Result getClubProfileByClub(Long clubId)
Merge branch 'play-api-develop-medinillag' into play-api-develop-wayo

Conflicts:
	app/models/Team.java
	app/models/User.java